Merge branch 'MDL-61520-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 18 Apr 2018 05:28:36 +0000 (13:28 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 18 Apr 2018 05:28:36 +0000 (13:28 +0800)

Trivial merge