Merge branch 'MDL-37177-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 4 Feb 2013 03:12:45 +0000 (11:12 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 4 Feb 2013 03:12:45 +0000 (11:12 +0800)
commitef23b6ff4f66cd70962b342a80514ad573d97148
tree07046c1cb855b3aa1cadd8461efede133174e1e3
parent7c433fa526b09b17176c041b73c65c9b1820e9d9
parentd422fb22f7bc6f9ad499ec375982bee331f50ce5
Merge branch 'MDL-37177-master' of git://github.com/FMCorz/moodle
lib/navigationlib.php