Merge branch 'MDL-57898-master' of git://github.com/marinaglancy/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 18 Jan 2019 14:21:23 +0000 (22:21 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 18 Jan 2019 14:21:23 +0000 (22:21 +0800)

Trivial merge