Merge branch 'w41_MDL-42047_m26_cohortdel' of https://github.com/skodak/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 9 Oct 2013 06:42:23 +0000 (14:42 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 9 Oct 2013 06:42:23 +0000 (14:42 +0800)

Trivial merge