diff options
author | Kim Alvefur <zash@zash.se> | 2016-07-08 15:12:44 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-07-08 15:12:44 +0200 |
commit | 8c0ca748b53ca43d707d86590f666bda5e908a81 (patch) | |
tree | 6af93350c7e5736376dcee4101e54b940539a50e /AUTHORS | |
parent | 02640bdb566f49709c408de4d8a10b42279a6431 (diff) | |
parent | ddccdcd00d24514e5a9bafad9d5789f674bd8770 (diff) | |
download | prosody-8c0ca748b53ca43d707d86590f666bda5e908a81.tar.gz prosody-8c0ca748b53ca43d707d86590f666bda5e908a81.zip |
Merge 0.10->trunk
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions