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

diff --cc course/view.php
Simple merge
Simple merge