Merge branch 'MDL-62202-master' of git://github.com/sarjona/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 3 May 2018 05:31:53 +0000 (13:31 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 3 May 2018 05:31:53 +0000 (13:31 +0800)

Trivial merge