Merge branch 'MDL-32932' of git://github.com/netspotau/moodle-mod_assign
authorSam Hemelryk <sam@moodle.com>
Tue, 22 May 2012 02:21:41 +0000 (14:21 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 22 May 2012 02:21:41 +0000 (14:21 +1200)
commitc5b8ae0eb7ffa63bbf661684491f2ddeefde01b0
treedf0455d160b882d3a22db80baa7d1bdcd4ce1691
parent5d6e603e1f6a31b37794fc10b31025735208ea42
parentbf78ebd650779231fc16bb0c50c9e2d80fd47bc9
Merge branch 'MDL-32932' of git://github.com/netspotau/moodle-mod_assign

Conflicts:
mod/assign/gradingtable.php
mod/assign/lang/en/assign.php
mod/assign/locallib.php
mod/assign/renderer.php
mod/assign/styles.css