diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-09-03 12:32:18 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-09-03 12:32:18 +0100 |
commit | 36a07920159d61c0320fd10c8f8b588628c8ff85 (patch) | |
tree | d09d7bb967b08c4950f0f241be175d676bf61c2e /core | |
parent | af9bff4f7ad3dfa4a3d3a9ec67d4a7ebde6ebf1f (diff) | |
parent | 7f9fe6d4cd5ddd4d260b68e57a8dc378175ef627 (diff) | |
download | prosody-36a07920159d61c0320fd10c8f8b588628c8ff85.tar.gz prosody-36a07920159d61c0320fd10c8f8b588628c8ff85.zip |
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions