aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-12-16 02:04:43 +0000
committerMatthew Wild <mwild1@gmail.com>2013-12-16 02:04:43 +0000
commit1f0a67c0df2212951c8ab693e4ab9b1088cfb11c (patch)
tree0342a9d6cca7783cc788e35fcdb464b904cde942 /net
parentc680f0d75a09ea19ca159d14ffb68e40ada91c90 (diff)
parent077a959dbc316d125f047c28f6a5eb89569dcf07 (diff)
downloadprosody-1f0a67c0df2212951c8ab693e4ab9b1088cfb11c.tar.gz
prosody-1f0a67c0df2212951c8ab693e4ab9b1088cfb11c.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions