diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-04-18 00:40:09 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-04-18 00:40:09 +0100 |
commit | bf38f876e605735ef40dbd1df591bfdc7cf92c68 (patch) | |
tree | cd8c1abd99ecc85279cea868fdd948620e8175d2 /Makefile | |
parent | 8432300448438ac440333c9b371826ace1fd7e86 (diff) | |
parent | 452d2d223c55c7eab964f9fc751fb50fe75a66a5 (diff) | |
download | prosody-bf38f876e605735ef40dbd1df591bfdc7cf92c68.tar.gz prosody-bf38f876e605735ef40dbd1df591bfdc7cf92c68.zip |
Merge backout
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions