Merge branch 'MDL-58272-master-2' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 11 Dec 2017 06:58:14 +0000 (14:58 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 11 Dec 2017 06:58:14 +0000 (14:58 +0800)

Trivial merge