Merge branch 'wip-MDL-21097-m23' of git://github.com/marinaglancy/moodle into MOODLE_...
commit92b8d952f1011e4f0a92493b7b3da86064ff3d80
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Jun 2013 23:43:34 +0000 (5 01:43 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Jun 2013 23:43:34 +0000 (5 01:43 +0200)
treec4c75ac5c64e83ddb22987ae04930b69798ae1bb
parent22be561eb66eae1e1f4e591599371f472e2bba04
parent39d0fe3693f2ffbb621f1e6b976fd76700cfd1e0
Merge branch 'wip-MDL-21097-m23' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE
lib/navigationlib.php