Merge branch 'MDL-30802' of git://github.com/timhunt/moodle
commitd0a8d045516a41b512174b55183d06298971c79c
authorSam Hemelryk <sam@moodle.com>
Mon, 2 Jan 2012 22:26:02 +0000 (3 11:26 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 2 Jan 2012 22:26:02 +0000 (3 11:26 +1300)
tree3f0e5c0d41e8705293587965e4fb494b9e14d4c4
parent929ea9ed6bd5cc2158f18aa0a3751d9e4db4396f
parent35c37afc12d2a9216464a9ab69684602729a045d
Merge branch 'MDL-30802' of git://github.com/timhunt/moodle
lib/navigationlib.php