diff options
| author | Kim Alvefur <zash@zash.se> | 2016-04-05 20:54:43 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-04-05 20:54:43 +0200 |
| commit | 888df39003d093377dac8e3a0cba7670d996bc07 (patch) | |
| tree | 7760f4f8fcb6ea74fffad05e021256ddade0bc0f /CHANGES | |
| parent | 69f2c9017677ef6a1bbec03793ee219d16d09f81 (diff) | |
| parent | 5c224f9d182a770df51727fbad0798c8e9fe9b31 (diff) | |
| download | prosody-888df39003d093377dac8e3a0cba7670d996bc07.tar.gz prosody-888df39003d093377dac8e3a0cba7670d996bc07.zip | |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions