Merge branch 'MDL-66378-master' of git://github.com/andrewnicols/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 21 Aug 2019 00:54:34 +0000 (08:54 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 21 Aug 2019 00:54:34 +0000 (08:54 +0800)

Trivial merge