Merge branch 'w38_MDL-35465_m24_cohortscleanup' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Sep 2012 14:55:42 +0000 (16:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Sep 2012 14:55:42 +0000 (16:55 +0200)

Trivial merge