diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-11-13 04:12:49 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-11-13 04:12:49 +0000 |
commit | 60f1317b8728e8ea8c367f9f344216fb6cf0a948 (patch) | |
tree | 19c4219d23df4908a601eda7d58b72d879712278 /prosody | |
parent | 79e901ace54c31d646e5056a60ae57970f13f7f3 (diff) | |
parent | a3aa9ad46c87d13909283827d07786b5b14c84c1 (diff) | |
download | prosody-60f1317b8728e8ea8c367f9f344216fb6cf0a948.tar.gz prosody-60f1317b8728e8ea8c367f9f344216fb6cf0a948.zip |
Merge backout
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions