aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-01-26 14:15:38 +0100
committerKim Alvefur <zash@zash.se>2016-01-26 14:15:38 +0100
commitacfde68f955864f2c08a3e6e85f7c95e1d7bd949 (patch)
treeef4b387b06b3d7a01769c3281ec3e928cd7c3385 /net
parent931549f781d8a0cb98af05b98cf00880dca5fb9f (diff)
parentab4c6bee84551806f9dc07eb8f1427d1c066eddf (diff)
downloadprosody-acfde68f955864f2c08a3e6e85f7c95e1d7bd949.tar.gz
prosody-acfde68f955864f2c08a3e6e85f7c95e1d7bd949.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions