diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-07-09 00:04:30 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-07-09 00:04:30 +0100 |
commit | b5ccfb0d7836918c0a65688df2f52e593304d83c (patch) | |
tree | a16ad67f4b3c386fb97dbe164983fe2f51e4b125 /core | |
parent | 316d5d6e0833d55bb49d8a2f8ba8afd9b6dd2ba5 (diff) | |
parent | 98ce25306381896a2502e833f1e218d7c599cc4e (diff) | |
download | prosody-b5ccfb0d7836918c0a65688df2f52e593304d83c.tar.gz prosody-b5ccfb0d7836918c0a65688df2f52e593304d83c.zip |
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions