Merge branch 'MDL-62286-master' of git://github.com/sarjona/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 7 May 2018 02:05:24 +0000 (10:05 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 7 May 2018 02:05:24 +0000 (10:05 +0800)

Trivial merge