diff options
author | Matthew Wild <mwild1@gmail.com> | 2009-06-27 04:44:27 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2009-06-27 04:44:27 +0100 |
commit | 29169a015f67d31329fdb23ace68caaff118e316 (patch) | |
tree | fbd548d974ae8403d584fa9b8f665a2b6f52d14e /prosody | |
parent | 852c7a62b1d7ffb7a95f7bb5d42a66ce1444b3f6 (diff) | |
parent | a01f4e62493a01afa9813c2197596854b62c7b71 (diff) | |
download | prosody-29169a015f67d31329fdb23ace68caaff118e316.tar.gz prosody-29169a015f67d31329fdb23ace68caaff118e316.zip |
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions