aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2012-12-21 09:04:54 +0100
committerKim Alvefur <zash@zash.se>2012-12-21 09:04:54 +0100
commit02a1cdf94866f4d3c7d985d659f50b5185d4f2a7 (patch)
treeb63e4c7674e6bd896bb1e663922f1afb3ebbd710 /net
parentffe6907cab680f6682eb3f2c184df35f6140937b (diff)
parentb1dd7b0be798b3f446cea7f0e4e1a4f05aea7750 (diff)
downloadprosody-02a1cdf94866f4d3c7d985d659f50b5185d4f2a7.tar.gz
prosody-02a1cdf94866f4d3c7d985d659f50b5185d4f2a7.zip
Merge 0.9->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions