Merge branch 'MDL-29821' of git://github.com/bostelm/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 2 Jan 2012 21:11:58 +0000 (10:11 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 2 Jan 2012 21:11:58 +0000 (10:11 +1300)
commit03273b535779df69337701b4b2b95fb6122efe6e
tree4df6693ab4ba21e655218aabf6e12357c4d6c67d
parented569481a3edc61bdfc360002622015df6d454ef
parent41eae0d9f368a652d74bd75ce44ce604aa50115b
Merge branch 'MDL-29821' of git://github.com/bostelm/moodle
lib/navigationlib.php