Merge branch 'MDL-53057-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 15 Mar 2016 07:19:01 +0000 (15:19 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 15 Mar 2016 07:19:01 +0000 (15:19 +0800)

Trivial merge