Merge branch 'MDL-50673-master-workshop-submissions' of git://github.com/mudrd8mz...
authorDan Poltawski <dan@moodle.com>
Mon, 20 Jul 2015 10:20:12 +0000 (11:20 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Jul 2015 10:20:12 +0000 (11:20 +0100)

Trivial merge