Merge branch 'wip-MDL-48347-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 15 Dec 2014 05:44:01 +0000 (13:44 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 15 Dec 2014 05:44:01 +0000 (13:44 +0800)

Trivial merge