Merge branch 'MDL-60899-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Dec 2017 03:48:42 +0000 (11:48 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 6 Dec 2017 06:53:31 +0000 (19:53 +1300)

Trivial merge