Merge branch 'MDL-61435-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Apr 2018 00:37:58 +0000 (08:37 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Apr 2018 00:37:58 +0000 (08:37 +0800)

Trivial merge