diff options
author | Matthew Wild <mwild1@gmail.com> | 2009-01-09 19:19:06 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2009-01-09 19:19:06 +0000 |
commit | fa0e1edd87a3224e998fd4bad37c03c9d2bfe027 (patch) | |
tree | 3915120b658649a92eb47bb1663677607fa0e083 /prosody | |
parent | 962ab41be7c3f2377ba4dabf7b9061dcdb1139a7 (diff) | |
parent | bd17ed3f7d3a20cd94ccadbe98bb057f8b8675fc (diff) | |
download | prosody-fa0e1edd87a3224e998fd4bad37c03c9d2bfe027.tar.gz prosody-fa0e1edd87a3224e998fd4bad37c03c9d2bfe027.zip |
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions