diff options
author | Kim Alvefur <zash@zash.se> | 2013-10-15 01:38:02 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-10-15 01:38:02 +0200 |
commit | 243b96a44040e06cc7164d6fe96b48da8ae23388 (patch) | |
tree | b0fe7dbc40ec776c811a1efc89510497970b46c7 /net | |
parent | b8308a01ffae00c3a0c9a9557036d6760c1cad57 (diff) | |
parent | 65931067bf8d24dc78885fabeed2297864ccebde (diff) | |
download | prosody-243b96a44040e06cc7164d6fe96b48da8ae23388.tar.gz prosody-243b96a44040e06cc7164d6fe96b48da8ae23388.zip |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions