aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-29 10:52:23 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-29 10:52:23 +0100
commitc01af4ad34666bc41d100aaedbd50c129c56d703 (patch)
treee8a0c90000f96854c20eddf617b4d3ef09dc8370 /core
parentc3f0b0a69820873f10445a98e2fd93884311d771 (diff)
parent590cf9abf5b8630a09cd1ede9c025f60440fbabf (diff)
downloadprosody-c01af4ad34666bc41d100aaedbd50c129c56d703.tar.gz
prosody-c01af4ad34666bc41d100aaedbd50c129c56d703.zip
Merge with Florob
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions