diff options
author | Kim Alvefur <zash@zash.se> | 2016-03-21 14:52:43 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-03-21 14:52:43 +0100 |
commit | 69b0605179de0b6ca719732d3d05e796816e0cad (patch) | |
tree | 85a3c7b4d4efadd9c68b69eac3178dca98372e19 /CHANGES | |
parent | 26f7bd10b05b0d95d6f8c588463e5c93382cdd75 (diff) | |
parent | c00adb21f49071216704b0c304da2fb4f52f81d4 (diff) | |
download | prosody-69b0605179de0b6ca719732d3d05e796816e0cad.tar.gz prosody-69b0605179de0b6ca719732d3d05e796816e0cad.zip |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions