diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-12-04 20:11:41 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-12-04 20:11:41 +0000 |
commit | ae8121e822f697715fe7c81d1c425fb7dc729a92 (patch) | |
tree | 5d3ad214d2ea5801a335c49abb280e7291aa7f07 /COPYING | |
parent | af18d67773bc5b2ce309ba99e7becbb7d80220ba (diff) | |
parent | 1e14564983afc5941868d319e71daaa0897ab06e (diff) | |
download | prosody-ae8121e822f697715fe7c81d1c425fb7dc729a92.tar.gz prosody-ae8121e822f697715fe7c81d1c425fb7dc729a92.zip |
Merge
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions