diff options
| author | Kim Alvefur <zash@zash.se> | 2016-07-13 18:43:33 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-07-13 18:43:33 +0200 |
| commit | 3616de36510d613e3eb2e75e730f5066bfa41741 (patch) | |
| tree | 211c2095c4ed506159c6508b1a901ac0ac56af38 /net | |
| parent | 21898f125205e79455e4e4539988e42a4d935b18 (diff) | |
| parent | 59fd8e3707ff2e70d90e285df366b47a25728928 (diff) | |
| download | prosody-3616de36510d613e3eb2e75e730f5066bfa41741.tar.gz prosody-3616de36510d613e3eb2e75e730f5066bfa41741.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions