Merge branch 'MDL-52068-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 8 Mar 2016 06:29:24 +0000 (14:29 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 8 Mar 2016 06:29:24 +0000 (14:29 +0800)

Trivial merge