aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-05-26 16:02:01 +0200
committerKim Alvefur <zash@zash.se>2013-05-26 16:02:01 +0200
commit3ec0f31581ee93e40f000e883ec0ad1a4e5b480c (patch)
tree035cdd418eff713bd33114630d1c6bdb5991fde1 /net
parent08466bf01179e9816d25ed8890f5af9cc8109928 (diff)
parentd162fd9921ce280027b1d2466f2a1f1d330347a6 (diff)
downloadprosody-3ec0f31581ee93e40f000e883ec0ad1a4e5b480c.tar.gz
prosody-3ec0f31581ee93e40f000e883ec0ad1a4e5b480c.zip
Merge 0.9->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions