Merge branch 'MDL-25988_20_wip_enrolroles' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 18 Jan 2011 09:41:23 +0000 (17:41 +0800)
committerSam Hemelryk <sam@moodle.com>
Tue, 18 Jan 2011 09:41:23 +0000 (17:41 +0800)

Trivial merge