Merge branch 'wip-MDL-23545-master' of https://github.com/Beedell/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 18 Sep 2018 01:47:38 +0000 (09:47 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 18 Sep 2018 01:47:38 +0000 (09:47 +0800)

Trivial merge