Merge branch 'w50_MDL-30528_m23_enrolroleid' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 8 Dec 2011 02:50:42 +0000 (15:50 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 8 Dec 2011 02:50:42 +0000 (15:50 +1300)

Trivial merge