aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-23 15:15:52 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-23 15:15:52 +0100
commitbac9625f119e516dd5ce7a9a503dd40cba751216 (patch)
treec9352f3197224088a16296c217e43ec770b21177 /core
parenta272d49260f7f211bc3fc290ac71ab77da2a9962 (diff)
parent5f9657f62054e9625810dacb9b59f6ee09bddf69 (diff)
downloadprosody-bac9625f119e516dd5ce7a9a503dd40cba751216.tar.gz
prosody-bac9625f119e516dd5ce7a9a503dd40cba751216.zip
Merges all the way down
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions