Merge branch 'MDL-59940-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Sep 2017 21:07:05 +0000 (23:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Sep 2017 21:07:05 +0000 (23:07 +0200)

Trivial merge