Merge branch 'w27_MDL-22404_m22_cohortbulk' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 11 Jul 2011 07:40:12 +0000 (15:40 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 11 Jul 2011 07:40:12 +0000 (15:40 +0800)
1  2 
lang/en/cohort.php

Simple merge