Merge branch 'MDL-62364_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 9 May 2018 10:29:17 +0000 (12:29 +0200)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 01:15:59 +0000 (09:15 +0800)

Trivial merge