Merge branch 'MDL-62783' of https://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Jun 2018 22:25:33 +0000 (00:25 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Jun 2018 22:25:33 +0000 (00:25 +0200)

Trivial merge