aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2014-05-08 18:09:59 +0100
committerMatthew Wild <mwild1@gmail.com>2014-05-08 18:09:59 +0100
commit4ac1cb06fe30df7b93958fd11fcbe248f1a8859c (patch)
treee489fa9811c3626353c6428617f626282a6e319d /net
parent36661ad7ac28934b50b14c82c89f2be126da34d4 (diff)
parent36353e3edb63ffa2612b0101d6a6133c9994c263 (diff)
downloadprosody-4ac1cb06fe30df7b93958fd11fcbe248f1a8859c.tar.gz
prosody-4ac1cb06fe30df7b93958fd11fcbe248f1a8859c.zip
Merge with Prosody trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions