Merge branch 'w37_MDL-27856_m24_cohortrestore' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Sep 2012 23:19:50 +0000 (01:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Sep 2012 23:19:50 +0000 (01:19 +0200)
1  2 
enrol/cohort/locallib.php

Simple merge