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)
commit26ed4e73ebdc80f25d77756644158d4de5f852bd
tree4d1ffc45d74732c5042d4fbe766e3b778e37f277
parent03a6727b6c53703c6250335caa1ad6e685e81fb4
parent8900213b922c577639b339618268c948052cda4f
Merge branch 'MDL-29615_control_override_email2' of git://github.com/andyjdavis/moodle