Merge branch 'MDL-61947-master' of git://github.com/zig-moodle/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 26 Apr 2018 06:51:19 +0000 (14:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 26 Apr 2018 06:51:19 +0000 (14:51 +0800)

Trivial merge