Merge branch 'wip-mdl-37015' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 23 Dec 2012 21:55:31 +0000 (10:55 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 23 Dec 2012 21:55:31 +0000 (10:55 +1300)
1  2 
course/lib.php
lib/navigationlib.php

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