Merge branch 'MDL-42494-workshop-exception' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 06:51:16 +0000 (14:51 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 06:51:16 +0000 (14:51 +0800)

Trivial merge