aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-05-10 10:48:07 +0100
committerMatthew Wild <mwild1@gmail.com>2013-05-10 10:48:07 +0100
commit33a4ee4b14e8ba0b22d038e06ed1daa695ce3648 (patch)
tree6ebabe3b7fdbc85dfee6bae922ecc2bf73f919fe /core
parentc3ea781f9f47946b386f1f4e3e1f872adf8f863f (diff)
parentfc293d102131bc1b7ca985c76f04ae4ace114401 (diff)
downloadprosody-33a4ee4b14e8ba0b22d038e06ed1daa695ce3648.tar.gz
prosody-33a4ee4b14e8ba0b22d038e06ed1daa695ce3648.zip
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions