Merge branch 'MDL-53228-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 22 Mar 2016 03:35:54 +0000 (11:35 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 22 Mar 2016 03:35:54 +0000 (11:35 +0800)

Trivial merge