aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-15 21:26:20 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-15 21:26:20 +0100
commit1ed9154f6b3ea8039df0b02f306b6a3682d3f024 (patch)
tree4458cad42819d93c49bb5bed4a279ea396438161 /core
parentc30a7e8545d1354afe6c25018c7b74d6e09604da (diff)
parent427b82db0fd0d82101013628e0bc4158eeb72c06 (diff)
downloadprosody-1ed9154f6b3ea8039df0b02f306b6a3682d3f024.tar.gz
prosody-1ed9154f6b3ea8039df0b02f306b6a3682d3f024.zip
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions