Merge branch 'MDL-33536-master' of git://github.com/damyon/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 13 Nov 2013 05:10:42 +0000 (13:10 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 13 Nov 2013 05:10:42 +0000 (13:10 +0800)
1  2 
lib/navigationlib.php

Simple merge