Merge branch 'MDL-33952-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Jan 2014 04:55:36 +0000 (12:55 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Jan 2014 04:55:36 +0000 (12:55 +0800)
Conflicts:
mod/assignment/lang/en/assignment.php


Trivial merge