Merge branch 'MDL-58970-master' of https://github.com/abias/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Jun 2017 20:27:52 +0000 (22:27 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Jun 2017 20:27:52 +0000 (22:27 +0200)

Trivial merge