Merge branch 'MDL-63622-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 29 Oct 2018 03:36:20 +0000 (11:36 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 29 Oct 2018 03:36:20 +0000 (11:36 +0800)

Trivial merge