Merge branch 'MDL-62663' of https://github.com/andrewhancox/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Jul 2018 07:58:09 +0000 (09:58 +0200)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Jul 2018 00:46:43 +0000 (08:46 +0800)

Trivial merge