Merge branch 'wip-MDL-37757-master' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Dec 2017 01:18:25 +0000 (09:18 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 6 Dec 2017 06:53:29 +0000 (19:53 +1300)

Trivial merge