Merge branch 'MDL-37177-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 4 Feb 2013 03:12:45 +0000 (11:12 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 4 Feb 2013 03:12:45 +0000 (11:12 +0800)
1  2 
lib/navigationlib.php

Simple merge