Merge branch 'wip-MDL-49880-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 20 Apr 2015 04:12:44 +0000 (12:12 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 20 Apr 2015 04:12:44 +0000 (12:12 +0800)

Trivial merge