Merge branch 'MDL-65561-master' of git://github.com/bmbrands/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Tue, 20 Aug 2019 01:36:11 +0000 (09:36 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 20 Aug 2019 01:36:11 +0000 (09:36 +0800)

Trivial merge