Merge branch 'MDL-61878-master' of git://github.com/mihailges/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 19 Apr 2018 06:40:12 +0000 (14:40 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 19 Apr 2018 06:40:12 +0000 (14:40 +0800)

Trivial merge