Merge branch 'w49_MDL-29442_m25_entityutf8' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 21:22:19 +0000 (10:22 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 21:22:19 +0000 (10:22 +1300)
commit0296e662a30c37e5189a0f33a8c900ad832ba1cd
tree97cde4c28b367e881a33eccb5ffdcd7792bcecce
parent4e0c4ec70d6c69512581435269dce2f210aa8d79
parent1a4596e4348f515b2a6ee7181ff5638de95ac093
Merge branch 'w49_MDL-29442_m25_entityutf8' of git://github.com/skodak/moodle
lib/navigationlib.php