Merge branch 'MDL-62889_master' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Jul 2018 04:11:34 +0000 (12:11 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Jul 2018 04:11:34 +0000 (12:11 +0800)

Trivial merge