Merge branch 'MDL-49029_m32v2' of https://github.com/sbourget/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 11 Jul 2016 13:50:29 +0000 (15:50 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 11 Jul 2016 13:50:29 +0000 (15:50 +0200)

Trivial merge