aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-09-16 18:41:30 +0100
committerMatthew Wild <mwild1@gmail.com>2013-09-16 18:41:30 +0100
commit667dd24dc7b458b3279cab7d4e1f2f08272d4f4e (patch)
tree8a6566f103557bfe7152d2c8de256f5fabd8b4db /core
parent88613e4e188d1ea21f44d7db686a06287ffee6a6 (diff)
parent02ce848f9e81e0201d42449c1bcab8274817fb47 (diff)
downloadprosody-667dd24dc7b458b3279cab7d4e1f2f08272d4f4e.tar.gz
prosody-667dd24dc7b458b3279cab7d4e1f2f08272d4f4e.zip
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions