Merge branch 'MDL-30271-switch-role-workshop' of git://github.com/mudrd8mz/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 30 Nov 2011 22:48:55 +0000 (11:48 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 30 Nov 2011 22:48:55 +0000 (11:48 +1300)

Trivial merge