Merge branch 'MDL-65562_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 10 Jul 2019 00:09:25 +0000 (08:09 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 10 Jul 2019 00:09:25 +0000 (08:09 +0800)

Trivial merge