Merge branch 'MDL-62151-master' of git://github.com/bmbrands/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 4 May 2018 02:55:50 +0000 (10:55 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 4 May 2018 02:55:50 +0000 (10:55 +0800)

Trivial merge