Merge branch 'MDL-61916-master' of git://github.com/cescobedo/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Apr 2018 03:17:08 +0000 (11:17 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Apr 2018 03:17:08 +0000 (11:17 +0800)

Trivial merge