Merge branch 'MDL-62140_master' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 Apr 2018 02:04:52 +0000 (10:04 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 Apr 2018 02:04:52 +0000 (10:04 +0800)

Trivial merge