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

author Sam Hemelryk <sam@moodle.com>

Mon, 9 Apr 2012 22:53:34 +0000 (10:53 +1200)

committer Sam Hemelryk <sam@moodle.com>

Mon, 9 Apr 2012 22:53:34 +0000 (10:53 +1200)
author Sam Hemelryk <sam@moodle.com>
Mon, 9 Apr 2012 22:53:34 +0000 (10:53 +1200)
committer Sam Hemelryk <sam@moodle.com>
Mon, 9 Apr 2012 22:53:34 +0000 (10:53 +1200)
diff --cc index.php
Simple merge
diff --cc lib/navigationlib.php
Simple merge
author	Sam Hemelryk <sam@moodle.com>
	Mon, 9 Apr 2012 22:53:34 +0000 (10:53 +1200)
committer	Sam Hemelryk <sam@moodle.com>
	Mon, 9 Apr 2012 22:53:34 +0000 (10:53 +1200)
		1	2
index.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/navigationlib.php	patch \|	diff1 \|	diff2 \|	blob \| history