Merge branch 'MDL-35388' of git://github.com/Lightwork-Marking/moodle into integration
authorDamyon Wiese <damyon.wiese@netspot.com.au>
Thu, 13 Sep 2012 02:02:55 +0000 (10:02 +0800)
committerDamyon Wiese <damyon.wiese@netspot.com.au>
Thu, 13 Sep 2012 02:03:40 +0000 (10:03 +0800)
commitfd637d38ac8195feb22f0f4a3022f3d99dbd918f
tree55928de8681ecdd6a2aa2af0270b40ee9ae46e6e
parent36b76c1ff91dca31237dfc771bc1a121dffde59d
parent2cffef9f41d26c1daddc066f4d82479f89351d28
Merge branch 'MDL-35388' of git://github.com/Lightwork-Marking/moodle into integration

Conflicts:
mod/assign/locallib.php
mod/assign/lib.php
mod/assign/locallib.php