Merge branch 'MDL-35206-email-links' of git://github.com/mudrd8mz/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 1 Jul 2013 01:08:31 +0000 (13:08 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 1 Jul 2013 01:08:31 +0000 (13:08 +1200)

Trivial merge