Merge branch 'MDL-61156-master' of https://github.com/mwehr/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 15 Jan 2018 05:48:08 +0000 (13:48 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 15 Jan 2018 05:48:08 +0000 (13:48 +0800)

Trivial merge