Merge branch 'MDL-64299' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Sun, 2 Dec 2018 23:53:38 +0000 (07:53 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Sun, 2 Dec 2018 23:53:38 +0000 (07:53 +0800)

Trivial merge