Merge branch 'MDL-39059-workshop-settype' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 10 Apr 2013 02:55:45 +0000 (10:55 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 10 Apr 2013 02:55:45 +0000 (10:55 +0800)

Trivial merge