Merge branch 'MDL-53179' of https://github.com/andrewhancox/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 15 Mar 2016 07:07:46 +0000 (15:07 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 15 Mar 2016 07:07:46 +0000 (15:07 +0800)

Trivial merge