Merge branch 'MDL-62209-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 May 2018 03:42:44 +0000 (11:42 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 May 2018 03:42:44 +0000 (11:42 +0800)

Trivial merge