Merge branch 'MDL-63468-master-v1' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 19 Nov 2018 02:33:23 +0000 (10:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 19 Nov 2018 02:33:23 +0000 (10:33 +0800)

Trivial merge