aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-12-16 16:45:57 +0000
committerMatthew Wild <mwild1@gmail.com>2015-12-16 16:45:57 +0000
commit32e49dccd82a8e392cc20a33881644b435dc269d (patch)
treeafcf1e14e2c570a3d6ece2f1b15d67be4f601a85 /prosody
parented274d1253637e39f3bcaadcfc817cdf3f705c63 (diff)
parent54e77b9859b2c0e94624d1eeb3c929693a0ce304 (diff)
downloadprosody-32e49dccd82a8e392cc20a33881644b435dc269d.tar.gz
prosody-32e49dccd82a8e392cc20a33881644b435dc269d.zip
Merge 0.9->0.10
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions