aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-03-27 00:29:35 +0100
committerKim Alvefur <zash@zash.se>2015-03-27 00:29:35 +0100
commitf3797f8dc8d711759fa4bf93a3a13f4dadbfdd7a (patch)
treead3ee8d4a9b63497d30feb2402030d74219a246b /net
parent6c87dbadb1c9f96442f874dd78edd8b85abfb472 (diff)
parent9e44974cd3e26de7abfe12fab2ee54b02b5da654 (diff)
downloadprosody-f3797f8dc8d711759fa4bf93a3a13f4dadbfdd7a.tar.gz
prosody-f3797f8dc8d711759fa4bf93a3a13f4dadbfdd7a.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions