aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2014-08-28 12:24:15 +0100
committerMatthew Wild <mwild1@gmail.com>2014-08-28 12:24:15 +0100
commitb0ad339e78ae34b938af8b58691d1ef962b09890 (patch)
treef9b41c73e3cda1b1f3ffe63a3921967eea4a20d6 /net
parent656d194bd1e0022605ab0a5b66da7ee2c5a3a1d3 (diff)
parentc4703af9c8bbd60fbb58da158ebd565f68d8442d (diff)
downloadprosody-b0ad339e78ae34b938af8b58691d1ef962b09890.tar.gz
prosody-b0ad339e78ae34b938af8b58691d1ef962b09890.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions