aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-03-27 00:29:35 +0100
committerKim Alvefur <zash@zash.se>2015-03-27 00:29:35 +0100
commit847f4204accf62ae15f623698c4842b08440a2cd (patch)
treead3ee8d4a9b63497d30feb2402030d74219a246b /core
parentf52319aeb3d82d34fdf8699084cdff3460d43c5c (diff)
parent77b653d31a2a47e92cae7ddfa18961bdc2b365e8 (diff)
downloadprosody-847f4204accf62ae15f623698c4842b08440a2cd.tar.gz
prosody-847f4204accf62ae15f623698c4842b08440a2cd.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions