diff options
author | Kim Alvefur <zash@zash.se> | 2015-09-22 01:31:52 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-09-22 01:31:52 +0200 |
commit | 5dcb0569722d6feea8942fd5acc8af7805060f8b (patch) | |
tree | f6ad57a51df3f189d7ece7f43682e7ccd147537c /AUTHORS | |
parent | 9b97c52790a17ea25e0e7ab96fe62280e4dbfea8 (diff) | |
parent | 366a13d95f528d6dba5e5ae05910fe6675c28df9 (diff) | |
download | prosody-5dcb0569722d6feea8942fd5acc8af7805060f8b.tar.gz prosody-5dcb0569722d6feea8942fd5acc8af7805060f8b.zip |
Merge 0.10->trunk
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions