Merge branch 'MDL-62189-master' of git://github.com/bmbrands/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 2 May 2018 04:24:20 +0000 (12:24 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 2 May 2018 04:24:20 +0000 (12:24 +0800)

Trivial merge