aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-07-06 17:07:05 +0100
committerMatthew Wild <mwild1@gmail.com>2015-07-06 17:07:05 +0100
commit855cb99f3c81b03fdeb27896d59ed9b66900ae02 (patch)
tree116641904bf26766fe52624f4ef7af24d77ae2ee /core
parente6b0ecf2435c94405c08f5ffd7d595f0b75cc8a4 (diff)
parent5292b8232a0cb961cc2d301556a179505ba98dee (diff)
downloadprosody-855cb99f3c81b03fdeb27896d59ed9b66900ae02.tar.gz
prosody-855cb99f3c81b03fdeb27896d59ed9b66900ae02.zip
Merge with 0.10
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions