Merge branch 'wip-MDL-27064-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Mar 2012 02:49:05 +0000 (15:49 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Mar 2012 02:49:05 +0000 (15:49 +1300)
commitf359fd6fcc99a9eeecea994e94a999bc7ebb7ef4
tree265bc9e32d9a40f8748019016419081764acf43d
parent1a8ea682ef9fb0f758fefa08c3936ff2a85389a5
parentec21eaba2e56122904519a4825c55d0053ab6e60
Merge branch 'wip-MDL-27064-master' of git://github.com/phalacee/moodle
lib/navigationlib.php