Merge remote-tracking branch 'skodak/w03_MDL-31092_m23_emailpass'
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Jan 2012 06:30:43 +0000 (14:30 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Jan 2012 06:30:43 +0000 (14:30 +0800)

Trivial merge