Merge branch '46518-28' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 24 Oct 2014 14:16:55 +0000 (15:16 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 24 Oct 2014 14:16:55 +0000 (15:16 +0100)
commitd6eff32be004e08feb7dcc0086497a0324f077fc
treec4cdaaa27ebd8ba32f467cb3764416eca50dbffd
parent0b03353433131cfed1f3c7ce4c504abe5313f559
parent5c28d1598552830448ea219ab0e813da2a29466f
Merge branch '46518-28' of git://github.com/samhemelryk/moodle
lib/navigationlib.php