Merge branch 'MDL-31158_grade_recovery' of git://github.com/andyjdavis/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 21 Feb 2012 01:44:50 +0000 (14:44 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 21 Feb 2012 01:44:50 +0000 (14:44 +1300)

Trivial merge