Merge branch '48070-29' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Nov 2014 02:41:28 +0000 (03:41 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Nov 2014 02:41:28 +0000 (03:41 +0100)
commitea1720be991fbb68262a75da794e9378ad53cd0a
tree75e9045178d106c14634e74d83507f8612dce476
parent5b9a75e1fe7e7dc74666e079d3301406a688cd55
parent699f60c6f712ef0ae09b9b57e1976b744e0d1888
Merge branch '48070-29' of git://github.com/samhemelryk/moodle
lib/navigationlib.php