aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-01-27 12:23:19 +0100
committerKim Alvefur <zash@zash.se>2017-01-27 12:23:19 +0100
commit4ec8a2f5b5961e90db28d92afd1f685966d8fe42 (patch)
treef90375b97b687b9dcb19e55c0bf48053c57549e7 /net
parent4c6a84a00ef37846e432ba76e3771087d23cceb1 (diff)
parentc8b213ff4f88ac6c0d21e58669d399d12f82c5b8 (diff)
downloadprosody-4ec8a2f5b5961e90db28d92afd1f685966d8fe42.tar.gz
prosody-4ec8a2f5b5961e90db28d92afd1f685966d8fe42.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions