Merge branch 'wip-MDL-30709-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 14 Feb 2012 04:14:05 +0000 (17:14 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 14 Feb 2012 04:14:05 +0000 (17:14 +1300)
1  2 
mod/assignment/lib.php

Simple merge