aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-04-10 13:15:11 +0200
committerKim Alvefur <zash@zash.se>2014-04-10 13:15:11 +0200
commitae8a4fb909a0cce10a12e9ced65e45ef2d1495fa (patch)
treeb842c0fb3552fbbaa03253af7cd869f0048753fa /net
parente06966ee436e4d461b03aaf8691fe76dcd6d588b (diff)
parent1f74845db7945a874ef308a9fe32edce4b2ed7fc (diff)
downloadprosody-ae8a4fb909a0cce10a12e9ced65e45ef2d1495fa.tar.gz
prosody-ae8a4fb909a0cce10a12e9ced65e45ef2d1495fa.zip
Merge 0.9->0.10
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions