Merge branch 'wip-MDL-32184-s23' of http://github.com/phalacee/moodle into MOODLE_23_...
authorDan Poltawski <dan@moodle.com>
Tue, 16 Oct 2012 02:46:49 +0000 (10:46 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 16 Oct 2012 02:46:49 +0000 (10:46 +0800)
1  2 
lib/navigationlib.php

Simple merge