Merge branch 'MDL-33763-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 2 Jun 2014 20:57:31 +0000 (08:57 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 2 Jun 2014 20:57:31 +0000 (08:57 +1200)
commit58e70de1935b7dcd9d64fe44150903a975b3d930
tree89fd2337b4f69aa1619f59f49c6d3bef061b378b
parent4df54b06f1ac8c08a4e4b5de9f86be7587b87b61
parent963402c2ba01912cf0bcb54c5e917e15a0c18ab1
Merge branch 'MDL-33763-master' of git://github.com/ankitagarwal/moodle
lib/navigationlib.php