Merge branch 'MDL-65082-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 22 Mar 2019 08:26:33 +0000 (16:26 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 22 Mar 2019 08:26:33 +0000 (16:26 +0800)

Trivial merge