Merge branch 'MDL-50524' of https://github.com/andrewhancox/moodle

author Dan Poltawski <dan@moodle.com>

Tue, 6 Oct 2015 15:06:41 +0000 (16:06 +0100)

committer Dan Poltawski <dan@moodle.com>

Tue, 6 Oct 2015 15:32:57 +0000 (16:32 +0100)
author Dan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 15:06:41 +0000 (16:06 +0100)
committer Dan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 15:32:57 +0000 (16:32 +0100)
diff --cc mod/assign/lang/en/assign.php
Simple merge
author	Dan Poltawski <dan@moodle.com>
	Tue, 6 Oct 2015 15:06:41 +0000 (16:06 +0100)
committer	Dan Poltawski <dan@moodle.com>
	Tue, 6 Oct 2015 15:32:57 +0000 (16:32 +0100)