diff options
author | Kim Alvefur <zash@zash.se> | 2016-08-18 17:36:46 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-08-18 17:36:46 +0200 |
commit | 782117034dc44969e35e4d35663045e5658b2913 (patch) | |
tree | a89e877c6e83d9aa3b79825812361591bf12bf2e /AUTHORS | |
parent | 5e5b45be6ea322d815872a499ba85d4584cd28fd (diff) | |
parent | f30f5f62189373fe8a2081d1117fbc2977331f26 (diff) | |
download | prosody-782117034dc44969e35e4d35663045e5658b2913.tar.gz prosody-782117034dc44969e35e4d35663045e5658b2913.zip |
Merge 0.10->trunk
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions