diff options
author | Kim Alvefur <zash@zash.se> | 2014-09-28 03:08:03 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-09-28 03:08:03 +0200 |
commit | 2555160000acd09e6b0a13f93d98bfd77e8a7ce5 (patch) | |
tree | 1e1b1c706f621ef388116c625cce1b601d21c2f5 /tools/xep227toprosody.lua | |
parent | 6915940fc56154fa39f13621ef668d2710cc59a0 (diff) | |
parent | 65b12619a33a83952023bd802bc89a3bec929455 (diff) | |
download | prosody-2555160000acd09e6b0a13f93d98bfd77e8a7ce5.tar.gz prosody-2555160000acd09e6b0a13f93d98bfd77e8a7ce5.zip |
Merge 0.10->trunk
Diffstat (limited to 'tools/xep227toprosody.lua')
0 files changed, 0 insertions, 0 deletions