Merge branch 'MDL-53350' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 8 Mar 2016 01:04:01 +0000 (09:04 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 8 Mar 2016 01:04:01 +0000 (09:04 +0800)

Trivial merge