Merge branch 'MDL-62171-master' of git://github.com/bmbrands/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 May 2018 05:10:34 +0000 (13:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 May 2018 05:10:34 +0000 (13:10 +0800)

Trivial merge