Merge branch 'MDL-59214-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Jun 2017 15:46:55 +0000 (17:46 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Jun 2017 15:46:55 +0000 (17:46 +0200)

Trivial merge