Merge branch 'MDL-30006-workshop-grades' of git://github.com/mudrd8mz/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 31 Oct 2011 00:06:10 +0000 (13:06 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 31 Oct 2011 00:06:10 +0000 (13:06 +1300)

Trivial merge