Merge branch 'wip-MDL-41369-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 4 Sep 2013 03:09:30 +0000 (11:09 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 4 Sep 2013 03:09:30 +0000 (11:09 +0800)
commit259dfc252178d2b7ac642d69e4ac6409c4b848b0
tree4d9e0087f3fee4f33a09fa1ebc0ab4fa6255c60f
parent7e2a4e1638806cbae9ec38025c7315801fbe4590
parent0e1bd87cc86defe8a94db6fbe2bda22d2a284e3f
Merge branch 'wip-MDL-41369-master' of git://github.com/marinaglancy/moodle
lib/navigationlib.php