Merge branch 'w24_MDL-39549_m23_cohortsearch' of git://github.com/skodak/moodle into...
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Jun 2013 03:47:38 +0000 (15:47 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Jun 2013 03:47:38 +0000 (15:47 +1200)

Trivial merge