Merge branch 'MDL-61575-master' of git://github.com/cescobedo/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Feb 2019 00:34:46 +0000 (08:34 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Feb 2019 00:34:46 +0000 (08:34 +0800)

Trivial merge