Merge branch 'MDL-54130_m31v2' of https://github.com/sbourget/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 May 2016 03:31:41 +0000 (11:31 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 May 2016 03:31:41 +0000 (11:31 +0800)

Trivial merge