Merge branch 'MDL-65644' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 May 2019 04:49:32 +0000 (12:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 May 2019 04:49:32 +0000 (12:49 +0800)

Trivial merge