Merge branch 'w37_MDL-35071_m24_enrolrestore' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Sep 2012 23:08:49 +0000 (01:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Sep 2012 23:08:49 +0000 (01:08 +0200)

Trivial merge