Merge branch 'wip-MDL-62481-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 May 2018 07:49:41 +0000 (15:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 May 2018 07:49:41 +0000 (15:49 +0800)

Trivial merge