aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-01-07 05:11:17 +0000
committerMatthew Wild <mwild1@gmail.com>2011-01-07 05:11:17 +0000
commit79bcb5c7cfed2a2ea89d2bac48bacb9e9447d599 (patch)
tree5223ae6345002c076cce53b7b6dc873228adabe8 /net
parent0318c8644d6c70deeb661c87c4cd8ed918497cdd (diff)
parentf12a844d966fd910f024f450eb6332d0a9a7ec26 (diff)
downloadprosody-79bcb5c7cfed2a2ea89d2bac48bacb9e9447d599.tar.gz
prosody-79bcb5c7cfed2a2ea89d2bac48bacb9e9447d599.zip
Merge 0.8->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions