Merge branch 'MDL-39979-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 9 Jun 2013 23:35:26 +0000 (11:35 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 9 Jun 2013 23:35:26 +0000 (11:35 +1200)
1  2 
lib/navigationlib.php

Simple merge