Merge branch 'wip-MDL-43218-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 11 Dec 2013 02:32:29 +0000 (15:32 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 11 Dec 2013 02:32:29 +0000 (15:32 +1300)
1  2 
lib/navigationlib.php

Simple merge