diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-07-22 16:17:33 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-07-22 16:17:33 +0100 |
commit | 92d6725339ce0233dffd2ecde606d684d05d4c93 (patch) | |
tree | 3f4c5a37a35c5475e37d19488151321c526daa8c /core | |
parent | 8ff644f2d3ae1e860396b211d9185a640f96cd73 (diff) | |
parent | fb3b789dca8a2cf050dad7a7bd445d4789eaabea (diff) | |
download | prosody-92d6725339ce0233dffd2ecde606d684d05d4c93.tar.gz prosody-92d6725339ce0233dffd2ecde606d684d05d4c93.zip |
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions