Merge branch 'MDL-49730-master-workshop-width' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Apr 2015 19:26:15 +0000 (20:26 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Apr 2015 19:26:15 +0000 (20:26 +0100)

Trivial merge