aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-07-28 09:39:50 +0100
committerMatthew Wild <mwild1@gmail.com>2016-07-28 09:39:50 +0100
commitd6780dd7edf90f052074613505fd5917e76b72e6 (patch)
treec1767a4b6577725fbe5586acab5a2453c18b373a /prosody
parenta12109bf85c36060767fb57446ea7c8b13b3afa7 (diff)
parentadd57bd7f62cd2ff4c5b5b72bceef0f74f8b1626 (diff)
downloadprosody-d6780dd7edf90f052074613505fd5917e76b72e6.tar.gz
prosody-d6780dd7edf90f052074613505fd5917e76b72e6.zip
Merge 0.10 -> trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions