diff options
| author | Kim Alvefur <zash@zash.se> | 2016-03-19 22:46:41 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-03-19 22:46:41 +0100 |
| commit | 26c655de373d763cae36ccc30bd9af95b44a86a4 (patch) | |
| tree | aaaa5f3bc1025f1c9ba90c3c636e818c534316e7 /CHANGES | |
| parent | 8c0392226672520d8a4a59e7f2544a2d4297d739 (diff) | |
| parent | 14810dd3617d6d780c50b4ee0548b04f329f0173 (diff) | |
| download | prosody-26c655de373d763cae36ccc30bd9af95b44a86a4.tar.gz prosody-26c655de373d763cae36ccc30bd9af95b44a86a4.zip | |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions