Merge branch 'wip-mdl-32270' of git://github.com/rajeshtaneja/moodle
commit859a181627ba3afb8da2a3f1c2bdac4d83b360d2
authorSam Hemelryk <sam@moodle.com>
Mon, 9 Apr 2012 22:53:34 +0000 (10 10:53 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 9 Apr 2012 22:53:34 +0000 (10 10:53 +1200)
tree5ab9d07b085f13214d13df296e9beae4b84a88e9
parentaef4aafa0b3f46b587a1e19afd9e7c92b9dfc08c
parentab6ec58a2e52e18490143085ca6d5c0d5177394d
Merge branch 'wip-mdl-32270' of git://github.com/rajeshtaneja/moodle
index.php
lib/navigationlib.php