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)
commite87a7c65f168fd80bb6e8197001e9d550d3f31c2
tree17cd4cad074ab4ee13d4b4d37d9b422f4b16198d
parentf98a3833b975d82faa8ffdbe187dd58578f60244
parentd20bffa2fd95435c87f94797dbc9ba2a0d264f96
Merge branch 'MDL-32714-rubric' of git://github.com/mudrd8mz/moodle