Merge branch 'MDL-54133_m31v1' of https://github.com/sbourget/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 May 2016 04:03:07 +0000 (12:03 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 May 2016 04:03:07 +0000 (12:03 +0800)

Trivial merge