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)
1  2 
lib/navigationlib.php

Simple merge