Merge branch 'MDL-40297' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 2 Jul 2013 05:43:40 +0000 (13:43 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 2 Jul 2013 05:43:40 +0000 (13:43 +0800)
commit20cea2c57f54e3beb61389b32d8fec07998e25bb
tree7db0ec73d5c48142a8cde315cd29b4f119fa8350
parent09c2ec4303a0da820198ab589e1d26c4a6a23418
parent19263336a0b6d7413d80037c4698c8f151cbc518
Merge branch 'MDL-40297' of git://github.com/stronk7/moodle
lib/navigationlib.php