Merge branch 'w02_MDL-35899_m25_cohortsort' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 16 Jan 2013 03:09:21 +0000 (11:09 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 16 Jan 2013 03:09:21 +0000 (11:09 +0800)

Trivial merge