diff options
author | Kim Alvefur <zash@zash.se> | 2013-10-31 20:49:03 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-10-31 20:49:03 +0100 |
commit | d938c65ce63fcc22d915abcc5215efdc52b5cec4 (patch) | |
tree | fc4ccb38b95ca249345023b2a6b8dc0bf1054deb /AUTHORS | |
parent | 9fde274e2174f63d3f50e38f2992b6019a106ec7 (diff) | |
parent | edc3624d3575688943cf8953d76f0c862189408f (diff) | |
download | prosody-d938c65ce63fcc22d915abcc5215efdc52b5cec4.tar.gz prosody-d938c65ce63fcc22d915abcc5215efdc52b5cec4.zip |
Merge 0.10 -> trunk
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions