Merge branch 'MDL-59395_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jul 2017 10:00:12 +0000 (12:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jul 2017 10:00:12 +0000 (12:00 +0200)

Trivial merge