Merge branch 'MDL-65540-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 10 May 2019 07:59:16 +0000 (15:59 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 10 May 2019 07:59:16 +0000 (15:59 +0800)

Trivial merge