Merge branch 'MDL-59248-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Oct 2017 10:35:59 +0000 (12:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Oct 2017 10:35:59 +0000 (12:35 +0200)

Trivial merge