Merge branch 'MDL-65560-master' of git://github.com/lameze/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 13 May 2019 01:43:58 +0000 (09:43 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 13 May 2019 01:43:58 +0000 (09:43 +0800)

Trivial merge