diff options
author | Kim Alvefur <zash@zash.se> | 2016-05-30 13:30:53 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-05-30 13:30:53 +0200 |
commit | 1b3f8491d969d4d8262b24379b774ee7a8057269 (patch) | |
tree | b2f8c6e26bbff9f2127c8acaa140ab5f29d499ca /CHANGES | |
parent | 6dbbb8fe6efc5a482d693860e5b716b3560f3739 (diff) | |
parent | fac7477aad15120e671c2634fcf785fd2c135416 (diff) | |
download | prosody-1b3f8491d969d4d8262b24379b774ee7a8057269.tar.gz prosody-1b3f8491d969d4d8262b24379b774ee7a8057269.zip |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions