Merge branch 'MDL-62225-master' of https://github.com/lucisgit/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 6 Jun 2018 07:56:38 +0000 (15:56 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jun 2018 09:16:31 +0000 (11:16 +0200)

Trivial merge