aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-11-10 23:10:46 +0000
committerMatthew Wild <mwild1@gmail.com>2013-11-10 23:10:46 +0000
commit2109d4abf0a687b620a3c21bfb1930bb291fa249 (patch)
treeee4bb5e7ca57631ceb44efe91d1e839806ccc3bb /core
parentea8974d055f7f015cb01ce7a43bc381455135439 (diff)
parent12cea7620002a3bdafcebcc321dff9cb13d0ca13 (diff)
downloadprosody-2109d4abf0a687b620a3c21bfb1930bb291fa249.tar.gz
prosody-2109d4abf0a687b620a3c21bfb1930bb291fa249.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions