Merge branch 'MDL-40297' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 2 Jul 2013 05:43:40 +0000 (13:43 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 2 Jul 2013 05:43:40 +0000 (13:43 +0800)
1  2 
lib/navigationlib.php

Simple merge