Merge branch 'MDL-63564-master' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Nov 2018 04:57:48 +0000 (12:57 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Nov 2018 04:57:48 +0000 (12:57 +0800)

Trivial merge