Merge branch 'wip-MDL-48760-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Feb 2015 08:38:34 +0000 (16:38 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Feb 2015 08:38:34 +0000 (16:38 +0800)

Trivial merge