Merge branch 'MDL-63552-master' of git://github.com/mickhawkins/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 25 Oct 2018 07:43:12 +0000 (15:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 25 Oct 2018 07:43:12 +0000 (15:43 +0800)

Trivial merge