diff options
| author | Kim Alvefur <zash@zash.se> | 2016-03-07 16:48:28 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-03-07 16:48:28 +0100 |
| commit | 037707af4ce4315efeb3f3ba01453e6cb82e922c (patch) | |
| tree | cf6e79601724c932aa530ca0699725d93f47ab32 /net | |
| parent | c92c12d5d2dc34214863c4bee72399c09a445394 (diff) | |
| parent | 413055c14de0e708abfc4034c0f36fc6e25ae344 (diff) | |
| download | prosody-037707af4ce4315efeb3f3ba01453e6cb82e922c.tar.gz prosody-037707af4ce4315efeb3f3ba01453e6cb82e922c.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions