Merge branch 'MDL-52838-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 10 Nov 2017 03:38:13 +0000 (11:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 10 Nov 2017 03:38:13 +0000 (11:38 +0800)

Trivial merge