aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-05-06 00:37:08 +0200
committerKim Alvefur <zash@zash.se>2014-05-06 00:37:08 +0200
commiteaeb3cfea49d3c4cdfebf7bdd281e5633765e31b (patch)
treef433cfe2fb83116b335ecb7b110523773268c12f /core
parent38d9c9ebddb923482b91361547ee73a6e5f2cbe8 (diff)
parenta39b07906f534a6fc85be2e70fe0aa4faac0cf4e (diff)
downloadprosody-eaeb3cfea49d3c4cdfebf7bdd281e5633765e31b.tar.gz
prosody-eaeb3cfea49d3c4cdfebf7bdd281e5633765e31b.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions