diff options
author | Matthew Wild <mwild1@gmail.com> | 2014-09-05 19:08:42 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2014-09-05 19:08:42 +0100 |
commit | c36bca4b4867166fdcc13b771eeab88aa467247f (patch) | |
tree | 70ced06db43d2b3ad16862e016d96b42dd1362a0 /core | |
parent | 25bb15fc749f2faed1e59ab55a2577729264c641 (diff) | |
parent | 716ad8b24a7dc699c39b8b30c484405035a078e8 (diff) | |
download | prosody-c36bca4b4867166fdcc13b771eeab88aa467247f.tar.gz prosody-c36bca4b4867166fdcc13b771eeab88aa467247f.zip |
Merge with Florob
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions