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)
commit5c7c9ea99ac45ae369c4c11f19f1cd41ce108c60
treede8952c066131595bd211da50eaa02aa01f82a06
parentb7a87899c55437fded70b6b9af9f8937076fe779
parent61ce548a71b80d9f10343344060657eef55edd5b
Merge branch 'MDL-51107-master' of git://github.com/FMCorz/moodle
lib/navigationlib.php
lib/upgrade.txt