diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-09-19 12:14:08 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-09-19 12:14:08 +0100 |
commit | fc11c75968dab816534939aafb2378dcd052c5e5 (patch) | |
tree | cf7a08a965f0bb9816285dcc830a140b62fc0ab1 /prosody | |
parent | 5f27e2a04037afdb5da8ef53b88ffa7b25014e32 (diff) | |
parent | ec41d90e0f1dd90bf7908acbf5ab25301dec9519 (diff) | |
download | prosody-fc11c75968dab816534939aafb2378dcd052c5e5.tar.gz prosody-fc11c75968dab816534939aafb2378dcd052c5e5.zip |
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions