Merge branch 'MDL-32213_manual_grade_question_upgrade' of git://github.com/davosmith...
authorDan Poltawski <dan@moodle.com>
Mon, 2 Apr 2012 08:59:10 +0000 (16:59 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Apr 2012 08:59:10 +0000 (16:59 +0800)

Trivial merge