Merge branch 'wip-MDL-38300-m25' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Mar 2013 00:21:47 +0000 (01:21 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Mar 2013 00:21:47 +0000 (01:21 +0100)
commit2b48123b92d89230d07201f1e3977656f9800ef1
treee8e14a4cf4372bce9880ee7e7edd0a53c22436fa
parentcaa5bcea00934ff9f8f261912c4b19f6600b1c86
parentcf7386139d9dd4a59eb888ff5986b3a350b03877
Merge branch 'wip-MDL-38300-m25' of git://github.com/samhemelryk/moodle
lib/navigationlib.php