Merge branch 'MDL-59761-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Sep 2017 08:41:17 +0000 (10:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Sep 2017 08:41:17 +0000 (10:41 +0200)

Trivial merge