Merge branch 'MDL-64644_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 11 Feb 2019 07:29:04 +0000 (15:29 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 11 Feb 2019 07:29:04 +0000 (15:29 +0800)

Trivial merge