Merge branch 'MDL-56498-master' of git://github.com/mickhawkins/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 29 May 2018 01:37:16 +0000 (09:37 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 29 May 2018 01:37:16 +0000 (09:37 +0800)

Trivial merge