Merge branch 'MDL-50794-master-workshop-restrict-filetypes' of git://github.com/mudrd...
authorDan Poltawski <dan@moodle.com>
Mon, 29 Feb 2016 08:15:27 +0000 (16:15 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Feb 2016 08:15:27 +0000 (16:15 +0800)

Trivial merge