Merge branch 'MDL-62996-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 6 Aug 2018 04:10:51 +0000 (12:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 6 Aug 2018 04:10:51 +0000 (12:10 +0800)

Trivial merge