aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-11-11 23:28:53 +0100
committerKim Alvefur <zash@zash.se>2013-11-11 23:28:53 +0100
commit7ab93b50b0c0f8592fb036cdc45e3b8a620d2f91 (patch)
treeb88d7632488c3ce383c723be20db538dd29ade44 /net
parentc71bff87a6601ab98221fed02f8c9b2a97a45d6f (diff)
parentb8218da015567c95dbc958d4d3885cf3ccb36050 (diff)
downloadprosody-7ab93b50b0c0f8592fb036cdc45e3b8a620d2f91.tar.gz
prosody-7ab93b50b0c0f8592fb036cdc45e3b8a620d2f91.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions