Merge branch 'MDL-62761-master' of https://github.com/jmvedrine/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 13 Aug 2018 13:29:34 +0000 (15:29 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 13 Aug 2018 13:29:34 +0000 (15:29 +0200)

Trivial merge