Merge branch 'MDL-61707-master' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 23 Jul 2018 03:33:20 +0000 (11:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 23 Jul 2018 03:33:20 +0000 (11:33 +0800)

Trivial merge