Merge branch 'w40_MDL-35701_m24_enroldb' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2012 19:27:55 +0000 (21:27 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2012 19:27:55 +0000 (21:27 +0200)

Trivial merge