diff options
author | Kim Alvefur <zash@zash.se> | 2017-02-10 21:34:16 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-02-10 21:34:16 +0100 |
commit | 89a1476a741679c8b39ec5443fd921fb26f338a3 (patch) | |
tree | b94754ed8abee90a404d2914f4e02e5e7ec38310 /net | |
parent | 314ce335b9a3f23224237f829c9b166eeb345187 (diff) | |
parent | 380b4987ad06be51a223ab85f0a24ef567538352 (diff) | |
download | prosody-89a1476a741679c8b39ec5443fd921fb26f338a3.tar.gz prosody-89a1476a741679c8b39ec5443fd921fb26f338a3.zip |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions