Merge branch 'MDL-26099-workshop-phase-switch' of git://github.com/mudrd8mz/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Apr 2012 03:00:20 +0000 (15:00 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Apr 2012 03:00:20 +0000 (15:00 +1200)

Trivial merge