Merge branch 'MDL-49662_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 13 Jan 2016 11:40:49 +0000 (11:40 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 13 Jan 2016 11:40:49 +0000 (11:40 +0000)
1  2 
lib/navigationlib.php

Simple merge