Merge branch 'MDL-64571-master' of git://github.com/cescobedo/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 21 Feb 2019 00:10:54 +0000 (08:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 21 Feb 2019 00:10:54 +0000 (08:10 +0800)

Trivial merge