Merge branch 'wip-MDL-39286-master' of git://github.com/ds125v/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 2 Dec 2013 07:16:12 +0000 (15:16 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 2 Dec 2013 07:16:12 +0000 (15:16 +0800)
1  2 
lib/navigationlib.php

Simple merge