aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-01-30 14:18:42 +0100
committerKim Alvefur <zash@zash.se>2016-01-30 14:18:42 +0100
commitbebb4e7b675a3db13263c1946c16b090bcf8f4f5 (patch)
tree6ddf6edc434992574acbd61b72b02e3fa584f7f8 /core
parent96dfcaadda01d04a2c3e097b7f84f4ad4b1130d8 (diff)
parentacacec8e82b6228d95a715750f68ea9c4cbeeaab (diff)
downloadprosody-bebb4e7b675a3db13263c1946c16b090bcf8f4f5.tar.gz
prosody-bebb4e7b675a3db13263c1946c16b090bcf8f4f5.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions