Merge branch 'MDL-13572_validate_email' of git://github.com/andyjdavis/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 2 Jan 2012 20:57:00 +0000 (09:57 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 2 Jan 2012 20:57:00 +0000 (09:57 +1300)

Trivial merge