Merge branch 'wip-MDL-50568-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 22 Jun 2015 07:33:06 +0000 (15:33 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 22 Jun 2015 07:33:06 +0000 (15:33 +0800)
1  2 
lib/navigationlib.php

Simple merge