Merge branch 'wip-MDL-62035-master' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 20 Apr 2018 03:16:46 +0000 (11:16 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 20 Apr 2018 03:16:46 +0000 (11:16 +0800)

Trivial merge