Merge branch 'MDL-53240-master-filetypewidgets' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Jun 2017 21:38:23 +0000 (23:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Jun 2017 21:38:23 +0000 (23:38 +0200)

Trivial merge