Merge branch 'MDL-31919-master-2' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 13 Mar 2012 01:00:41 +0000 (14:00 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 13 Mar 2012 01:00:41 +0000 (14:00 +1300)
1  2 
mod/assignment/lib.php

Simple merge