Merge branch 'wip-MDL-27058-master' of git://github.com/samhemelryk/moodle.git (solve...
authorAparup Banerjee <aparup@moodle.com>
Tue, 11 Oct 2011 05:37:34 +0000 (13:37 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 11 Oct 2011 05:37:34 +0000 (13:37 +0800)
commitfc09870e0e86ade039a746cf6c62675b39882c56
treede9744f4883289e3c50d195629e08220aea266bc
parent44d872b87eb2e9f51e0aef7057bb3795bdeb895c
parent356a6de3511972be1db86de76db7e7b822b4e2e3
Merge branch 'wip-MDL-27058-master' of git://github.com/samhemelryk/moodle.git (solved conflict)
lib/navigationlib.php