Merge branch 'MDL-64956-master2' of git://github.com/peterRd/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 18 Apr 2019 03:09:49 +0000 (11:09 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 18 Apr 2019 03:09:49 +0000 (11:09 +0800)

Trivial merge