Merge branch 'MDL-60339-master' of git://github.com/Chocolate-lightning/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 25 Mar 2019 03:09:54 +0000 (11:09 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 25 Mar 2019 03:09:54 +0000 (11:09 +0800)

Trivial merge