Merge branch 'w11_MDL-31845_m23_dbenrolcat' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Mar 2012 12:36:48 +0000 (13:36 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Mar 2012 12:36:48 +0000 (13:36 +0100)

Trivial merge