Merge branch 'MDL-59750-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 20 Sep 2017 10:45:37 +0000 (18:45 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 20 Sep 2017 10:45:37 +0000 (18:45 +0800)

Trivial merge