aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-09-03 16:43:46 +0100
committerMatthew Wild <mwild1@gmail.com>2015-09-03 16:43:46 +0100
commitd6e03dc82dfc3f5fa1787bda74195a994c113b79 (patch)
tree75ae2e07fd0ffea8a7063e9fbc3e5dbd0108d619 /core
parentee2c04d00330a6ac76b6360d2d06b02bcc001546 (diff)
parent24056ae3ad82a08483ac2449f1c36923a26358fa (diff)
downloadprosody-d6e03dc82dfc3f5fa1787bda74195a994c113b79.tar.gz
prosody-d6e03dc82dfc3f5fa1787bda74195a994c113b79.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions