diff options
author | Kim Alvefur <zash@zash.se> | 2016-03-19 22:46:41 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-03-19 22:46:41 +0100 |
commit | 44d0cf80e09f8c81a22ce91b9d9772bd47b2e4dc (patch) | |
tree | aaaa5f3bc1025f1c9ba90c3c636e818c534316e7 /CHANGES | |
parent | c7e80a8b0191239b7d7103154d4c079868234e41 (diff) | |
parent | 487f77d6ef7b64fccb2bb73a0710c6e669399153 (diff) | |
download | prosody-44d0cf80e09f8c81a22ce91b9d9772bd47b2e4dc.tar.gz prosody-44d0cf80e09f8c81a22ce91b9d9772bd47b2e4dc.zip |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions