Merge branch 'w35_MDL-35061_m24_enrolfields' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 13:58:19 +0000 (15:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 13:58:19 +0000 (15:58 +0200)

Trivial merge