Merge branch 'MDL-62208-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 30 Apr 2018 05:07:52 +0000 (13:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 30 Apr 2018 05:07:52 +0000 (13:07 +0800)

Trivial merge