Merge branch 'MDL-61881-master' of git://github.com/zig-moodle/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 Apr 2018 02:14:03 +0000 (10:14 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 Apr 2018 02:14:03 +0000 (10:14 +0800)

Trivial merge