Merge branch 'MDL-36623-master-int' of git://github.com/FMCorz/moodle

author Dan Poltawski <dan@moodle.com>

Tue, 27 Nov 2012 02:40:24 +0000 (10:40 +0800)

committer Dan Poltawski <dan@moodle.com>

Tue, 27 Nov 2012 02:40:24 +0000 (10:40 +0800)
author Dan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 02:40:24 +0000 (10:40 +0800)
committer Dan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 02:40:24 +0000 (10:40 +0800)
diff --cc course/lib.php
Simple merge
diff --cc theme/base/style/course.css
Simple merge
author	Dan Poltawski <dan@moodle.com>
	Tue, 27 Nov 2012 02:40:24 +0000 (10:40 +0800)
committer	Dan Poltawski <dan@moodle.com>
	Tue, 27 Nov 2012 02:40:24 +0000 (10:40 +0800)
		1	2
course/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history
theme/base/style/course.css	patch \|	diff1 \|	diff2 \|	blob \| history