Merge branch 'MDL-30607_override_email' of git://github.com/andyjdavis/moodle
authorAparup Banerjee <aparup@moodle.com>
Thu, 8 Dec 2011 05:38:54 +0000 (13:38 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 8 Dec 2011 05:38:54 +0000 (13:38 +0800)

Trivial merge