Merge branch 'w31_MDL-28468_m22_cohortassign' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 8 Aug 2011 02:06:06 +0000 (10:06 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 8 Aug 2011 02:06:06 +0000 (10:06 +0800)

Trivial merge