Merge branch 'wip-MDL-38055-m23' of git://github.com/samhemelryk/moodle into MOODLE_2...
authorDamyon Wiese <damyon@moodle.com>
Tue, 16 Apr 2013 07:14:19 +0000 (15:14 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 16 Apr 2013 07:14:19 +0000 (15:14 +0800)
1  2 
course/lib.php
lib/navigationlib.php

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