Merge branch 'MDL-48248-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 30 May 2016 05:02:34 +0000 (13:02 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 30 May 2016 05:02:34 +0000 (13:02 +0800)

Trivial merge