Merge branch 'w27_MDL-28278_m22_cohorticons' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 11 Jul 2011 06:18:54 +0000 (14:18 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 11 Jul 2011 06:18:54 +0000 (14:18 +0800)

Trivial merge