diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-07-05 17:40:12 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-07-05 17:40:12 +0100 |
commit | f2b3328bc1fb3dce23a783e2cd8932d0e1fba864 (patch) | |
tree | d14b44262cee1dc74af32fbaa4658385b9552152 /core | |
parent | 7a97efab5c5bf02bdba1840027de6e434b475ebb (diff) | |
parent | 2429531070ba2f2273a77c3512abbca5acda92ff (diff) | |
download | prosody-f2b3328bc1fb3dce23a783e2cd8932d0e1fba864.tar.gz prosody-f2b3328bc1fb3dce23a783e2cd8932d0e1fba864.zip |
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions