Merge branch 'MDL-51107-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Sep 2015 14:11:10 +0000 (15:11 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Sep 2015 14:11:10 +0000 (15:11 +0100)
1  2 
lib/navigationlib.php
lib/upgrade.txt

Simple merge
diff --cc lib/upgrade.txt
Simple merge