Merge branch 'w42_MDL-29688_m22_enrol' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 26 Oct 2011 09:40:01 +0000 (11:40 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 26 Oct 2011 09:40:01 +0000 (11:40 +0200)

Trivial merge