Merge branch 'w27_MDL-28270_m22_cohortfilter' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jul 2011 18:22:42 +0000 (20:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jul 2011 18:22:42 +0000 (20:22 +0200)

Trivial merge