Merge branch 'MDL-31682' of git://github.com/Lightwork-Marking/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 14 Jan 2013 21:21:20 +0000 (10:21 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 14 Jan 2013 21:21:20 +0000 (10:21 +1300)
commitddca5610d314fe41d98cff1290c873d17c01ff26
treedea0a43c24b6358c870a48dffacdc6c1c7c5944a
parentccc89b8235e8ddc9525e6139021c0f7d16feb546
parentc144959c4d8a8776f4e8e843dd641a0b2d19f0cc
Merge branch 'MDL-31682' of git://github.com/Lightwork-Marking/moodle

Conflicts:
mod/assign/version.php
mod/assign/externallib.php
mod/assign/version.php