Merge branch 'MDL-60901' of git://github.com/stronk7/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 4 Sep 2018 02:17:23 +0000 (10:17 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 4 Sep 2018 02:17:23 +0000 (10:17 +0800)

Trivial merge