Merge branch 'MDL-39497-workshop-allocator-stable' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 May 2013 15:42:19 +0000 (16:42 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 7 May 2013 15:42:19 +0000 (16:42 +0100)

Trivial merge