Merge branch 'MDL-61984-master-fixup' of https://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 Apr 2018 03:03:12 +0000 (11:03 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 Apr 2018 03:03:12 +0000 (11:03 +0800)

Trivial merge