Merge branch 'MDL-62055-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 23 Apr 2018 08:03:13 +0000 (16:03 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 23 Apr 2018 08:03:13 +0000 (16:03 +0800)

Trivial merge