diff options
author | Kim Alvefur <zash@zash.se> | 2015-10-02 12:13:32 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-10-02 12:13:32 +0200 |
commit | 70775be1a0515ec0c52986541c7f9e0038cc9604 (patch) | |
tree | fdbe2b55e4c4f871de4fc6cb9aa004e0da258221 /AUTHORS | |
parent | 3fc78cf2154d9a870763a06801bd167ddabf1c61 (diff) | |
parent | d208ade2a7afd0b03932cc24103486076ab20a42 (diff) | |
download | prosody-70775be1a0515ec0c52986541c7f9e0038cc9604.tar.gz prosody-70775be1a0515ec0c52986541c7f9e0038cc9604.zip |
Merge 0.10->trunk
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions