Merge branch 'MDL-63140-master' of git://github.com/rezaies/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 19 Sep 2018 11:30:43 +0000 (13:30 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 19 Sep 2018 11:30:43 +0000 (13:30 +0200)

Trivial merge