diff options
| author | Matthew Wild <mwild1@gmail.com> | 2016-02-04 14:57:45 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2016-02-04 14:57:45 +0000 |
| commit | 00594e00a27c5172e9e5484e671427910f05cdd4 (patch) | |
| tree | 90c1e4b01272e10b12ecce57402e602d2b05f7ed /CHANGES | |
| parent | 7b11f2c6503e05ad3281b30c4998a8faaea3e418 (diff) | |
| parent | de372ae2452684e5a9de1b41e5f14bcda0bbe8d9 (diff) | |
| download | prosody-00594e00a27c5172e9e5484e671427910f05cdd4.tar.gz prosody-00594e00a27c5172e9e5484e671427910f05cdd4.zip | |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions