aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-01-26 18:48:21 +0000
committerMatthew Wild <mwild1@gmail.com>2012-01-26 18:48:21 +0000
commit85a4ddb16de85a50dd226a45c2fca885fc95b665 (patch)
tree977aaba7354c482266ebde89a7d44312e77aa4b2 /net
parent7437e279cbe895b88dbf7902f86cc0a9803cd04a (diff)
parent52e7f9dcbd32b32b774523d365d4ca5e3ef50b0d (diff)
downloadprosody-85a4ddb16de85a50dd226a45c2fca885fc95b665.tar.gz
prosody-85a4ddb16de85a50dd226a45c2fca885fc95b665.zip
Merge with 0.9
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions