diff options
author | Matthew Wild <mwild1@gmail.com> | 2011-01-06 14:46:59 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2011-01-06 14:46:59 +0000 |
commit | b4101c237eccd6680323f37840b99263e7d85d47 (patch) | |
tree | 42846932897416865a6f0c78c054b74301984019 /Makefile | |
parent | 486b9b1a306b2a56ec75b62d8c8a9375b45b1de8 (diff) | |
parent | cac05ef600cb92726706c193a53a51ad116e837a (diff) | |
download | prosody-b4101c237eccd6680323f37840b99263e7d85d47.tar.gz prosody-b4101c237eccd6680323f37840b99263e7d85d47.zip |
Merge 0.8->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions