Merge branch 'MDL-61411-master' of git://github.com/Kathrin84/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 May 2018 03:21:23 +0000 (11:21 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 May 2018 03:21:23 +0000 (11:21 +0800)

Trivial merge