diff options
author | Matthew Wild <mwild1@gmail.com> | 2016-07-27 15:05:54 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2016-07-27 15:05:54 +0100 |
commit | a12109bf85c36060767fb57446ea7c8b13b3afa7 (patch) | |
tree | f9bc84d329f400068f3439ac86f1b62942f68eda /prosody | |
parent | e68e90bd30e81a46052bcf33ea8da344dfc0557b (diff) | |
parent | e8e6ffc9695bec3219efa62a590a11bf413266e6 (diff) | |
download | prosody-a12109bf85c36060767fb57446ea7c8b13b3afa7.tar.gz prosody-a12109bf85c36060767fb57446ea7c8b13b3afa7.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions