Merge branch 'MDL-46934-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 23 May 2016 06:38:01 +0000 (14:38 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 23 May 2016 06:38:01 +0000 (14:38 +0800)

Trivial merge