Merge branch 'w07_MDL-25998_20_enrolrole' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 11:41:16 +0000 (12:41 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 11:41:16 +0000 (12:41 +0100)

Trivial merge