Merge branch 'MDL-32638-workshop-files' of git://github.com/mudrd8mz/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 30 Apr 2012 01:26:38 +0000 (13:26 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 30 Apr 2012 01:26:38 +0000 (13:26 +1200)

Trivial merge