Merge branch 'MDL-62798-master' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Aug 2018 05:07:31 +0000 (13:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Aug 2018 05:07:31 +0000 (13:07 +0800)

Trivial merge