Merge branch 'wip-MDL-53467-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 29 Mar 2016 05:38:14 +0000 (13:38 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 29 Mar 2016 05:38:14 +0000 (13:38 +0800)

Trivial merge