diff options
author | Kim Alvefur <zash@zash.se> | 2016-03-24 13:57:58 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-03-24 13:57:58 +0100 |
commit | 4ca8e2aaed9b4e58ee1a9b67bb8a6d9f99e51632 (patch) | |
tree | d6ebdfc4aefc67d749aa7322ce910b83c4119f47 /AUTHORS | |
parent | 5aed00374715e5ca0149888dcd0df88291015809 (diff) | |
parent | 41522cb84acb3639a8cdd494a4a6b1da04121318 (diff) | |
download | prosody-4ca8e2aaed9b4e58ee1a9b67bb8a6d9f99e51632.tar.gz prosody-4ca8e2aaed9b4e58ee1a9b67bb8a6d9f99e51632.zip |
Merge 0.10->trunk
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions