Merge branch 'MDL-62491-master-fix' of git://github.com/abgreeve/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 9 Oct 2018 06:09:28 +0000 (14:09 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 9 Oct 2018 06:09:28 +0000 (14:09 +0800)

Trivial merge