aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-26 12:25:53 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-26 12:25:53 +0100
commit240c5480a9abde4de5eab78c4da287e4e3de7509 (patch)
tree60d2de07f0307ab6968d36f1f27f4b938e53dc80 /core
parentf9884fa773f3d56f098218729578b48da374342d (diff)
parent231a76965c326988df9bceb6de5341814e1099e9 (diff)
downloadprosody-240c5480a9abde4de5eab78c4da287e4e3de7509.tar.gz
prosody-240c5480a9abde4de5eab78c4da287e4e3de7509.zip
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions