Merge branch 'MDL-33794' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Jun 2012 08:08:39 +0000 (16:08 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Jun 2012 08:08:39 +0000 (16:08 +0800)
Conflicts:
mod/assign/version.php


Trivial merge