Merge branch 'MDL-63988-master' of git://github.com/bmbrands/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 28 Nov 2018 23:26:45 +0000 (07:26 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 28 Nov 2018 23:26:45 +0000 (07:26 +0800)

Trivial merge