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)
commitd1426e2843a9b57145e1494c933290dbea0e3f4e
tree3a5d2a2f01d96224a0d2c81f6d2d1d97b7253a1a
parent8c0ddd430a4bff4373be92bf3d7d98695c580348
parent40cb48792a46f31a56775fd15fb365146b8a6541
Merge branch 'MDL-33952-master' of git://github.com/damyon/moodle

Conflicts:
mod/assignment/lang/en/assignment.php