Merge branch 'MDL-52414_m31v7' of https://github.com/sbourget/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 16 Feb 2016 04:44:09 +0000 (12:44 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 16 Feb 2016 04:44:09 +0000 (12:44 +0800)

Trivial merge