aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-05-11 01:32:46 +0100
committerMatthew Wild <mwild1@gmail.com>2012-05-11 01:32:46 +0100
commit38a7865229c7049bcbfa3e7f78016bf5e988ca28 (patch)
treea0564ac0d43d718d122652133cc4c3a5453f8995 /net
parentd0b87d8ac6edb12b2eb1b0550fe4e273e8720446 (diff)
parentf3aaf833ca073cef76d781a3d27108e27160271e (diff)
downloadprosody-38a7865229c7049bcbfa3e7f78016bf5e988ca28.tar.gz
prosody-38a7865229c7049bcbfa3e7f78016bf5e988ca28.zip
Merge with backout
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions