Merge branch 'w11_MDL-31815_m23_confirmemail' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Mar 2012 15:33:27 +0000 (16:33 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Mar 2012 15:33:27 +0000 (16:33 +0100)

Trivial merge