Merge branch 'MDL-64181-master' of git://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 27 Nov 2018 03:47:15 +0000 (11:47 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 27 Nov 2018 03:47:15 +0000 (11:47 +0800)

Trivial merge