diff options
| author | Kim Alvefur <zash@zash.se> | 2016-10-16 00:39:10 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-10-16 00:39:10 +0200 |
| commit | 98be2f263bd887a0f0f53a405f9d8f42d270a176 (patch) | |
| tree | 9b1c27bfc13dcff3fd25049c59879bd327919188 /prosody | |
| parent | 332c6b47df58aae6c9c4299d65e1fc43a4ca1989 (diff) | |
| parent | 176661cc07459d4fc656e711b7c85c3f1703a1d0 (diff) | |
| download | prosody-98be2f263bd887a0f0f53a405f9d8f42d270a176.tar.gz prosody-98be2f263bd887a0f0f53a405f9d8f42d270a176.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions