Merge branch 'w10_MDL-31807_m23_cohort' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 5 Mar 2012 03:56:30 +0000 (16:56 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 5 Mar 2012 03:56:30 +0000 (16:56 +1300)

Trivial merge