Merge branch 'wip-MDL-42577-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 4 Nov 2013 06:24:46 +0000 (14:24 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 4 Nov 2013 06:24:46 +0000 (14:24 +0800)

Trivial merge