Merge branch 'MDL-53234-support-email' of https://github.com/brendanheywood/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 15 Mar 2016 05:43:22 +0000 (13:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 15 Mar 2016 05:43:22 +0000 (13:43 +0800)

Trivial merge