Merge branch 'MDL-40908_master' of https://github.com/markn86/moodle

author Sam Hemelryk <sam@moodle.com>

Tue, 8 Apr 2014 23:26:33 +0000 (11:26 +1200)

committer Sam Hemelryk <sam@moodle.com>

Tue, 8 Apr 2014 23:26:33 +0000 (11:26 +1200)
author Sam Hemelryk <sam@moodle.com>
Tue, 8 Apr 2014 23:26:33 +0000 (11:26 +1200)
committer Sam Hemelryk <sam@moodle.com>
Tue, 8 Apr 2014 23:26:33 +0000 (11:26 +1200)
diff --cc course/lib.php
Simple merge
diff --cc lib/adminlib.php
Simple merge
author	Sam Hemelryk <sam@moodle.com>
	Tue, 8 Apr 2014 23:26:33 +0000 (11:26 +1200)
committer	Sam Hemelryk <sam@moodle.com>
	Tue, 8 Apr 2014 23:26:33 +0000 (11:26 +1200)
		1	2
course/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/adminlib.php	patch \|	diff1 \|	diff2 \|	blob \| history