Merge branch 'wip-mdl-37015' of git://github.com/rajeshtaneja/moodle

author Sam Hemelryk <sam@moodle.com>

Sun, 23 Dec 2012 21:55:31 +0000 (10:55 +1300)

committer Sam Hemelryk <sam@moodle.com>

Sun, 23 Dec 2012 21:55:31 +0000 (10:55 +1300)
author Sam Hemelryk <sam@moodle.com>
Sun, 23 Dec 2012 21:55:31 +0000 (10:55 +1300)
committer Sam Hemelryk <sam@moodle.com>
Sun, 23 Dec 2012 21:55:31 +0000 (10:55 +1300)
diff --cc course/lib.php
Simple merge
diff --cc lib/navigationlib.php
Simple merge
author	Sam Hemelryk <sam@moodle.com>
	Sun, 23 Dec 2012 21:55:31 +0000 (10:55 +1300)
committer	Sam Hemelryk <sam@moodle.com>
	Sun, 23 Dec 2012 21:55:31 +0000 (10:55 +1300)
		1	2
course/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/navigationlib.php	patch \|	diff1 \|	diff2 \|	blob \| history