Merge branch 'MDL-64632_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 5 Feb 2019 14:41:20 +0000 (22:41 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 5 Feb 2019 14:41:20 +0000 (22:41 +0800)

Trivial merge