diff options
| author | Kim Alvefur <zash@zash.se> | 2016-03-29 15:38:14 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-03-29 15:38:14 +0200 |
| commit | 41aae0c0c5349de539b4d6805d73849823c25340 (patch) | |
| tree | fe70196be61487570b1e5364d6a2d114791755bd /CHANGES | |
| parent | 7b609609f929e1125b9347d7fb0b8e080da3ce5c (diff) | |
| parent | a358cc2e16e7fcd0c2c0099ebaa13e8c02a3dfb0 (diff) | |
| download | prosody-41aae0c0c5349de539b4d6805d73849823c25340.tar.gz prosody-41aae0c0c5349de539b4d6805d73849823c25340.zip | |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions