Merge branch 'wip-MDL-61976-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 9 May 2018 09:43:25 +0000 (11:43 +0200)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 01:15:59 +0000 (09:15 +0800)

Trivial merge