Merge branch 'MDL-29814_blank_emails2' of git://github.com/andyjdavis/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 21 Nov 2011 17:15:26 +0000 (01:15 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 21 Nov 2011 17:15:26 +0000 (01:15 +0800)

Trivial merge