Merge branch 'MDL-62026-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 Jul 2018 00:13:11 +0000 (08:13 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 Jul 2018 00:13:11 +0000 (08:13 +0800)

Trivial merge