Merge branch 'wip-mdl-37329-new' of git://github.com/rajeshtaneja/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 20 Feb 2013 00:54:57 +0000 (08:54 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 20 Feb 2013 00:54:57 +0000 (08:54 +0800)
1  2 
lib/navigationlib.php

Simple merge