diff options
author | Kim Alvefur <zash@zash.se> | 2017-04-13 01:30:24 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-04-13 01:30:24 +0200 |
commit | a4b0c946f61d5639fe652d9ddc13bfd0f63d9a17 (patch) | |
tree | d35772be38d4db051d3631f2aeca80f0d0aa8ea1 /prosody | |
parent | d418ed105c8eba8fb03375c3e13daf6ef261cfa5 (diff) | |
parent | 6670a5b17909e755e132a1d211d8e4a1524dac19 (diff) | |
download | prosody-a4b0c946f61d5639fe652d9ddc13bfd0f63d9a17.tar.gz prosody-a4b0c946f61d5639fe652d9ddc13bfd0f63d9a17.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions