Merge branch 'wip-MDL-38055-m25' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 16 Apr 2013 06:32:53 +0000 (14:32 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 16 Apr 2013 06:32:53 +0000 (14:32 +0800)
1  2 
lib/navigationlib.php

Simple merge