Merge branch 'MDL-62382-master' of git://github.com/ryanwyllie/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 11 May 2018 04:06:03 +0000 (12:06 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 11 May 2018 04:06:03 +0000 (12:06 +0800)

Trivial merge