Merge branch 'MDL-62482' of git://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 May 2018 01:37:57 +0000 (09:37 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 May 2018 01:37:57 +0000 (09:37 +0800)

Trivial merge