aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-04-19 17:44:11 +0200
committerKim Alvefur <zash@zash.se>2016-04-19 17:44:11 +0200
commit73aae92a78fccd3327ac327ae6c1ef46b92e90cc (patch)
tree028c7d68e28e807e5b55504faeaa1cf3d6211aaf /net
parent503138ad403a2606eaeb60ae2236c3ce90c8acea (diff)
parentad3f7a961c28540805a905993b265ff3d9e0e292 (diff)
downloadprosody-73aae92a78fccd3327ac327ae6c1ef46b92e90cc.tar.gz
prosody-73aae92a78fccd3327ac327ae6c1ef46b92e90cc.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions