diff options
author | Kim Alvefur <zash@zash.se> | 2016-12-10 02:55:38 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-12-10 02:55:38 +0100 |
commit | 10a290e111c447b2062e103397058ce6ca8c7cfc (patch) | |
tree | 0c45bcdafed730fb0e14edfd08a8f649bf100fa6 /net | |
parent | 4688968fe15623c69158d4ceef63d83e3ef2ddb2 (diff) | |
parent | ae46d59b51d61f816e70c128717e9fd1b9b02baf (diff) | |
download | prosody-10a290e111c447b2062e103397058ce6ca8c7cfc.tar.gz prosody-10a290e111c447b2062e103397058ce6ca8c7cfc.zip |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions