Merge branch 'MDL-57486-master-fix' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 30 May 2018 05:20:42 +0000 (13:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 30 May 2018 05:20:42 +0000 (13:20 +0800)

Trivial merge