Merge branch 'MDL-61848-master' of git://github.com/cescobedo/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 20 Apr 2018 01:20:13 +0000 (09:20 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 20 Apr 2018 01:20:13 +0000 (09:20 +0800)

Trivial merge