aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-04-27 01:02:20 +0200
committerKim Alvefur <zash@zash.se>2014-04-27 01:02:20 +0200
commitf282f95465683073ef4c5a3d8fd2646eb8a8effe (patch)
tree2fc44a45626dec815109dafd52b02cca23d99cb3 /net
parent99e2e845ecb34568ce762a27c1c5d52c6f086525 (diff)
parenteb66dffc2645967e922c17b1db559409ccc71d88 (diff)
downloadprosody-f282f95465683073ef4c5a3d8fd2646eb8a8effe.tar.gz
prosody-f282f95465683073ef4c5a3d8fd2646eb8a8effe.zip
Merge 0.9->0.10
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions