Merge branch 'MDL-53353' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 8 Mar 2016 00:44:28 +0000 (08:44 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 8 Mar 2016 00:44:28 +0000 (08:44 +0800)

Trivial merge