Merge branch 'MDL-64835-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 13 Feb 2019 08:27:15 +0000 (16:27 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 13 Feb 2019 08:27:15 +0000 (16:27 +0800)

Trivial merge