Merge branch 'wip-MDL-50568-master' of git://github.com/marinaglancy/moodle
commit336bded4f188336ad52395f506e8d595486bcb14
authorDavid Monllao <davidm@moodle.com>
Mon, 22 Jun 2015 07:33:06 +0000 (22 15:33 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 22 Jun 2015 07:33:06 +0000 (22 15:33 +0800)
treed0d0b6b92ebc2b699a0e4223bb4034a13beeedcd
parent502d96052881cd06f32b0e473d6bb0b9c4809e25
parent1d61d565749dd284638b2b0a1f47bcaaacb1421b
Merge branch 'wip-MDL-50568-master' of git://github.com/marinaglancy/moodle
lib/navigationlib.php