Merge branch 'w11_MDL-27457_m23_enrolnorecover' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Mar 2012 23:00:08 +0000 (12:00 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Mar 2012 23:00:08 +0000 (12:00 +1300)

Trivial merge