diff options
author | Kim Alvefur <zash@zash.se> | 2016-04-02 17:13:12 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-04-02 17:13:12 +0200 |
commit | d5c31923e6b7d3884d3b7d16b8dae355511d9773 (patch) | |
tree | 53679081d88331034afaa2bea1ac671a886d597a /CHANGES | |
parent | 467b6b0bfe3b69ac9c178ff06b310bb58d4b6617 (diff) | |
parent | 5db607f37e4370d12d350c0894804331a0231d5e (diff) | |
download | prosody-d5c31923e6b7d3884d3b7d16b8dae355511d9773.tar.gz prosody-d5c31923e6b7d3884d3b7d16b8dae355511d9773.zip |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions