Merge branch 'MDL-61269' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Feb 2018 09:29:25 +0000 (17:29 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Feb 2018 09:29:25 +0000 (17:29 +0800)

Trivial merge