Merge branch 'wip-MDL-49742-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 18 May 2015 02:16:49 +0000 (10:16 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 18 May 2015 02:16:49 +0000 (10:16 +0800)

Trivial merge