Merge branch 'MDL-55957-master-workshopfiles' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Sep 2016 09:37:06 +0000 (10:37 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Sep 2016 09:37:06 +0000 (10:37 +0100)

Trivial merge