diff options
| author | Kim Alvefur <zash@zash.se> | 2017-03-06 16:05:57 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-03-06 16:05:57 +0100 |
| commit | 6403594a10e820f81e9bdffed95d947b7350cca9 (patch) | |
| tree | 5a6ccfcd8d9fb6e2f2d1d35910732fba43e61132 /net | |
| parent | 367037154898857cf54466a6b5eb8889f04006cb (diff) | |
| parent | 66618bf09cc664d9375bf41174297714782b4346 (diff) | |
| download | prosody-6403594a10e820f81e9bdffed95d947b7350cca9.tar.gz prosody-6403594a10e820f81e9bdffed95d947b7350cca9.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions