aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-07-27 15:05:54 +0100
committerMatthew Wild <mwild1@gmail.com>2016-07-27 15:05:54 +0100
commit52717fc086cb6453c0a5341c0cdc2d0cdba18b83 (patch)
treef9bc84d329f400068f3439ac86f1b62942f68eda /prosody
parent3a8e8da3dfd5635cbf67c9d9d1c768e07a53cee3 (diff)
parenta5e5091b70b0b76d717bb387382b4be226e25f4c (diff)
downloadprosody-52717fc086cb6453c0a5341c0cdc2d0cdba18b83.tar.gz
prosody-52717fc086cb6453c0a5341c0cdc2d0cdba18b83.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions