Merge branch 'MDL-64280-master' of https://github.com/lucaboesch/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 11 Dec 2018 01:54:03 +0000 (09:54 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 11 Dec 2018 01:54:03 +0000 (09:54 +0800)

Trivial merge