Merge branch 'MDL-32714-rubric' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 May 2012 02:41:46 +0000 (10:41 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 14 May 2012 02:41:46 +0000 (10:41 +0800)

Trivial merge