diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-05-10 10:48:07 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-05-10 10:48:07 +0100 |
commit | 8c189d268e700e18db59afed37af79e61e0f8b20 (patch) | |
tree | 6ebabe3b7fdbc85dfee6bae922ecc2bf73f919fe /core | |
parent | 0a7aa9be7afef15a53c7f46a2a58e3381a348d36 (diff) | |
parent | 8124de1f0e093a3b97bd9fbdb19975f1c9c02a26 (diff) | |
download | prosody-8c189d268e700e18db59afed37af79e61e0f8b20.tar.gz prosody-8c189d268e700e18db59afed37af79e61e0f8b20.zip |
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions