Merge branch 'MDL-49662_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 13 Jan 2016 11:40:49 +0000 (11:40 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 13 Jan 2016 11:40:49 +0000 (11:40 +0000)
commit74a088bc8200910d2d2e9ef2e867b82036c45728
treedbbc58be44ee5f05be7257d6cc72893c5ff6da15
parent51443a21309e047abb35d8e482560c4e67472145
parenta0ac16cb88925ebc68bb8f215d05d338c7f61967
Merge branch 'MDL-49662_master' of git://github.com/markn86/moodle
lib/navigationlib.php