diff options
author | Kim Alvefur <zash@zash.se> | 2016-08-19 22:49:36 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-08-19 22:49:36 +0200 |
commit | b2bedf9f16dba9bf7496b4e50997e380b28c5b1e (patch) | |
tree | 13796311a587eff27c57e9c7bbdb6fa1602096be /CHANGES | |
parent | 286527bbc911a241e2b7c287686056dcc68c12ba (diff) | |
parent | 75ff5d1a054175bf5dc659ceb0c6bc3f6f1a2525 (diff) | |
download | prosody-b2bedf9f16dba9bf7496b4e50997e380b28c5b1e.tar.gz prosody-b2bedf9f16dba9bf7496b4e50997e380b28c5b1e.zip |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions