Merge branch 'w04_MDL-31178_m23_enrolledws' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 23 Jan 2012 07:27:43 +0000 (15:27 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 23 Jan 2012 07:27:43 +0000 (15:27 +0800)

Trivial merge