Merge branch 'MDL-29615_control_override_email2' of git://github.com/andyjdavis/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Feb 2012 12:17:08 +0000 (13:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Feb 2012 12:17:08 +0000 (13:17 +0100)

Trivial merge