Merge branch 'MDL-45847_master' of https://github.com/Syxton/moodle

author Dan Poltawski <dan@moodle.com>

Mon, 21 Jul 2014 11:09:10 +0000 (12:09 +0100)

committer Dan Poltawski <dan@moodle.com>

Mon, 21 Jul 2014 11:09:10 +0000 (12:09 +0100)
author Dan Poltawski <dan@moodle.com>
Mon, 21 Jul 2014 11:09:10 +0000 (12:09 +0100)
committer Dan Poltawski <dan@moodle.com>
Mon, 21 Jul 2014 11:09:10 +0000 (12:09 +0100)
diff --cc course/classes/management_renderer.php
Simple merge
diff --cc course/management.php
Simple merge
diff --cc lang/en/moodle.php
Simple merge
author	Dan Poltawski <dan@moodle.com>
	Mon, 21 Jul 2014 11:09:10 +0000 (12:09 +0100)
committer	Dan Poltawski <dan@moodle.com>
	Mon, 21 Jul 2014 11:09:10 +0000 (12:09 +0100)
		1	2
course/classes/management_renderer.php	patch \|	diff1 \|	diff2 \|	blob \| history
course/management.php	patch \|	diff1 \|	diff2 \|	blob \| history
lang/en/moodle.php	patch \|	diff1 \|	diff2 \|	blob \| history