diff options
author | Kim Alvefur <zash@zash.se> | 2016-04-08 17:54:50 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-04-08 17:54:50 +0200 |
commit | 7f668a8d577b71115bf3193b7c34bee75b61fdf1 (patch) | |
tree | 8cabfe532140fe1b4028c9e6a15c0f700f3e900c /CHANGES | |
parent | 619e2c834d19364137a8bd112c126ef6197b6bac (diff) | |
parent | 6ff1b30f47299861e35162b538e9db6f5c52bf85 (diff) | |
download | prosody-7f668a8d577b71115bf3193b7c34bee75b61fdf1.tar.gz prosody-7f668a8d577b71115bf3193b7c34bee75b61fdf1.zip |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions