aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2012-12-16 08:37:14 +0100
committerKim Alvefur <zash@zash.se>2012-12-16 08:37:14 +0100
commitaa8855f3c7d1a2e4506b66294f22a2dab5662258 (patch)
treec604c2a76b0d571da3c39a2b8505ca1a538f4f3a /core
parent107f416233b2c0291d524774757d0ef6910295b5 (diff)
parenteaba58e39b083025ae4236d3ef516b59c081d326 (diff)
downloadprosody-aa8855f3c7d1a2e4506b66294f22a2dab5662258.tar.gz
prosody-aa8855f3c7d1a2e4506b66294f22a2dab5662258.zip
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions