aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2014-07-25 13:54:27 +0100
committerMatthew Wild <mwild1@gmail.com>2014-07-25 13:54:27 +0100
commit302c40a40db05cafad981fd5565e0c8281d8919f (patch)
tree2bf143aa85236f3dfda8d62425b70811ae9e49e2 /core
parent9d6c2816c42ff0431b6353505443b3ddb9d9f936 (diff)
parent5647cd22878f2872de88f7f9be6ab5d4ed5f7639 (diff)
downloadprosody-302c40a40db05cafad981fd5565e0c8281d8919f.tar.gz
prosody-302c40a40db05cafad981fd5565e0c8281d8919f.zip
Merge 0.9->0.10
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions