Merge branch 'MDL-62948-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 23 Jul 2018 07:20:47 +0000 (15:20 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 23 Jul 2018 07:20:47 +0000 (15:20 +0800)

Trivial merge