aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-06-12 17:31:55 +0100
committerMatthew Wild <mwild1@gmail.com>2012-06-12 17:31:55 +0100
commit94d42dfe8737ff3b5fe28e56f5b9d7cf0c0a0330 (patch)
tree5821c632e94a3d6d3d1b8e8c5dd0053f635b8813 /core
parentd786589002d3626b31dcf95f929854db29d0b433 (diff)
parent49d3586dc142ca99b3f8b95584b8375fd7b5ab7c (diff)
downloadprosody-94d42dfe8737ff3b5fe28e56f5b9d7cf0c0a0330.tar.gz
prosody-94d42dfe8737ff3b5fe28e56f5b9d7cf0c0a0330.zip
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions