Merge branch 'wip-MDL-61937-master-fix' of https://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 May 2018 06:43:04 +0000 (14:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 May 2018 06:43:04 +0000 (14:43 +0800)

Trivial merge