Merge branch 'wip-MDL-53399' of https://github.com/JoeyAndres/moodle

author Andrew Nicols <andrew@nicols.co.uk>

Tue, 21 Jun 2016 01:03:48 +0000 (09:03 +0800)

committer Andrew Nicols <andrew@nicols.co.uk>

Tue, 21 Jun 2016 01:03:48 +0000 (09:03 +0800)
author Andrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 01:03:48 +0000 (09:03 +0800)
committer Andrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 01:03:48 +0000 (09:03 +0800)
diff --cc course/view.php
Simple merge
diff --cc lang/en/admin.php
Simple merge
diff --cc lang/en/moodle.php
Simple merge
author	Andrew Nicols <andrew@nicols.co.uk>
	Tue, 21 Jun 2016 01:03:48 +0000 (09:03 +0800)
committer	Andrew Nicols <andrew@nicols.co.uk>
	Tue, 21 Jun 2016 01:03:48 +0000 (09:03 +0800)
		1	2
course/view.php	patch \|	diff1 \|	diff2 \|	blob \| history
lang/en/admin.php	patch \|	diff1 \|	diff2 \|	blob \| history
lang/en/moodle.php	patch \|	diff1 \|	diff2 \|	blob \| history