Merge branch 'MDL-54044-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 11 May 2016 01:09:11 +0000 (09:09 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 11 May 2016 01:09:11 +0000 (09:09 +0800)

Trivial merge