Merge branch 'MDL-63643-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 5 Jun 2019 07:43:35 +0000 (15:43 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 5 Jun 2019 07:43:35 +0000 (15:43 +0800)

Trivial merge