Merge branch 'wip-MDL-38442-m25' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Apr 2013 07:39:57 +0000 (15:39 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Apr 2013 07:39:57 +0000 (15:39 +0800)
commitca0b1f57fcc38e8b0127da497181c5d3f1af4e17
tree9d657d0f658a293953521437afcd98e242ddd57c
parent92674e324e7f2b9e1fda2a735e4a776b619afea1
parent8718ffbac518d28ad8de67197d8802e405915f59
Merge branch 'wip-MDL-38442-m25' of git://github.com/samhemelryk/moodle
lib/navigationlib.php