aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-07-05 18:00:05 +0200
committerKim Alvefur <zash@zash.se>2015-07-05 18:00:05 +0200
commit5c4f162797b7f2ba6faa6f9f3ce0ed5db7bee0ad (patch)
treeffbe134470891e53fe689b44843c22b48c6b680b /net
parent6e187489a98a403ae236a9595fbd0f80d3ff6490 (diff)
parentc9035dd6cdab062206e57e3df9415cb8e6f0bc0a (diff)
downloadprosody-5c4f162797b7f2ba6faa6f9f3ce0ed5db7bee0ad.tar.gz
prosody-5c4f162797b7f2ba6faa6f9f3ce0ed5db7bee0ad.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions