Merge branch 'MDL-62371-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 May 2018 00:37:38 +0000 (02:37 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 May 2018 00:37:38 +0000 (02:37 +0200)

Trivial merge