Merge branch 'MDL-24951' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Jan 2019 22:41:00 +0000 (06:41 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Jan 2019 22:41:00 +0000 (06:41 +0800)

Trivial merge