aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2012-12-11 23:41:02 +0100
committerKim Alvefur <zash@zash.se>2012-12-11 23:41:02 +0100
commit2d53117389c12d91cec1e47214f8351738b390b9 (patch)
tree01480064b551797a731a1c5e9711d20bace32942 /core
parent35cb12c554d8b5ee7134a0e15556e91a81a093b4 (diff)
parent8c8d3b759f1d99a687f859c2ca96bf008bcd24ec (diff)
downloadprosody-2d53117389c12d91cec1e47214f8351738b390b9.tar.gz
prosody-2d53117389c12d91cec1e47214f8351738b390b9.zip
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions