Merge branch 'MDL-38564-master' of git://github.com/ankitagarwal/moodle

author Aparup Banerjee <aparup@moodle.com>

Tue, 26 Mar 2013 09:20:01 +0000 (17:20 +0800)

committer Aparup Banerjee <aparup@moodle.com>

Tue, 26 Mar 2013 09:20:01 +0000 (17:20 +0800)
author Aparup Banerjee <aparup@moodle.com>
Tue, 26 Mar 2013 09:20:01 +0000 (17:20 +0800)
committer Aparup Banerjee <aparup@moodle.com>
Tue, 26 Mar 2013 09:20:01 +0000 (17:20 +0800)
diff --cc course/lib.php
Simple merge
diff --cc course/recent.php
Simple merge
diff --cc course/tests/courselib_test.php
Simple merge
author	Aparup Banerjee <aparup@moodle.com>
	Tue, 26 Mar 2013 09:20:01 +0000 (17:20 +0800)
committer	Aparup Banerjee <aparup@moodle.com>
	Tue, 26 Mar 2013 09:20:01 +0000 (17:20 +0800)
		1	2
course/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history
course/recent.php	patch \|	diff1 \|	diff2 \|	blob \| history
course/tests/courselib_test.php	patch \|	diff1 \|	diff2 \|	blob \| history