Merge branch 'MDL-30506' of git://github.com/jonof/moodle
commita509cb29c30749ec37a329cd08b111b351bf5f1a
authorSam Hemelryk <sam@moodle.com>
Thu, 7 Jun 2012 21:04:46 +0000 (8 09:04 +1200)
committerSam Hemelryk <sam@moodle.com>
Thu, 7 Jun 2012 21:04:46 +0000 (8 09:04 +1200)
tree6cdb189cf6087e8b49d79e3835087d5f307f7768
parent55244f85279ee8135c164ae4884dc6b18b01f70f
parent0cc24b84258f6a99a2b409772eb7a290032862f4
Merge branch 'MDL-30506' of git://github.com/jonof/moodle
lib/navigationlib.php