Merge branch 'w36_MDL-29306_m22_dbenrolroles' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Sep 2011 03:30:15 +0000 (15:30 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Sep 2011 03:30:15 +0000 (15:30 +1200)

Trivial merge