Merge branch 'MDL-31841_feedback_align' of git://github.com/andyjdavis/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Mar 2012 01:22:20 +0000 (14:22 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Mar 2012 01:22:20 +0000 (14:22 +1300)

Trivial merge