Merge branch 'MDL-51500-master' of git://github.com/merrill-oakland/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 15 Oct 2015 12:52:46 +0000 (13:52 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 15 Oct 2015 12:52:46 +0000 (13:52 +0100)
commitdf8afc6305dae34374555748d3ca3e1a5c0bcada
treecc8ee3353711a615cb8ea202be267ddfaa9eff00
parent52fa3d09d7d702f2600bae768156080af258ccef
parentea9431eb7b8d0fd856524a5b2f74cec52c6fcaf6
Merge branch 'MDL-51500-master' of git://github.com/merrill-oakland/moodle
lib/navigationlib.php