Merge branch 'MDL-64506' of git://github.com/Chocolate-lightning/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 4 Apr 2019 03:16:42 +0000 (11:16 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 4 Apr 2019 03:16:42 +0000 (11:16 +0800)

Trivial merge