Merge branch 'MDL-62709_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 18 Jun 2018 07:16:18 +0000 (15:16 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 18 Jun 2018 07:16:18 +0000 (15:16 +0800)

Trivial merge