aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-12-16 23:32:11 +0000
committerMatthew Wild <mwild1@gmail.com>2013-12-16 23:32:11 +0000
commit535e8c110294835d941ac834e88eeb8bb84d14f1 (patch)
tree19fa0823b9f58cbf86368625aef15c98eeb8fe8b /core
parent077a959dbc316d125f047c28f6a5eb89569dcf07 (diff)
parente204ed5dce8050537ca6d8af0c69a8b62ea8aa2e (diff)
downloadprosody-535e8c110294835d941ac834e88eeb8bb84d14f1.tar.gz
prosody-535e8c110294835d941ac834e88eeb8bb84d14f1.zip
Merge 0.9->0.10
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions