Merge branch 'MDL-62554-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 17 Sep 2018 11:44:49 +0000 (13:44 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 17 Sep 2018 11:44:49 +0000 (13:44 +0200)

Trivial merge