Merge branch 'wip-MDL-62493-master' of git://github.com/marinaglancy/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 28 May 2018 05:01:09 +0000 (13:01 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 28 May 2018 05:01:09 +0000 (13:01 +0800)

Trivial merge