Merge branch 'MDL-61877-master' of git://github.com/FMCorz/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 4 May 2018 03:25:49 +0000 (11:25 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 4 May 2018 03:25:49 +0000 (11:25 +0800)

Trivial merge