Merge branch 'MDL-59452-master-filetypesbehat' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Jul 2017 10:19:09 +0000 (12:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Jul 2017 10:19:09 +0000 (12:19 +0200)

Trivial merge