Merge branch 'MDL-62274-master' of git://github.com/bmbrands/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 May 2018 00:38:13 +0000 (08:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 May 2018 00:38:13 +0000 (08:38 +0800)

Trivial merge