Merge branch 'w04_MDL-26066_20_dbenrol' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Jan 2011 05:26:51 +0000 (13:26 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Jan 2011 05:26:51 +0000 (13:26 +0800)

Trivial merge