Merge branch 'w42_MDL-29688_m22_enrol' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 25 Oct 2011 01:02:20 +0000 (14:02 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 25 Oct 2011 01:02:20 +0000 (14:02 +1300)

Trivial merge