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)
Conflicts:
mod/assign/gradingtable.php

1  2 
mod/assign/lang/en/assign.php
mod/assign/locallib.php
mod/assign/renderer.php
mod/assign/styles.css

Simple merge
Simple merge
Simple merge
Simple merge