Merge branch 'MDL-64880-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 26 Feb 2019 03:11:53 +0000 (11:11 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 26 Feb 2019 03:11:53 +0000 (11:11 +0800)

Trivial merge