Merge branch 'MDL-52934-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 15 Mar 2016 00:58:33 +0000 (08:58 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 15 Mar 2016 00:58:33 +0000 (08:58 +0800)

Trivial merge