Merge branch 'wip-mdl-33367' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 6 Jun 2012 03:19:49 +0000 (15:19 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 6 Jun 2012 03:19:49 +0000 (15:19 +1200)
1  2 
course/lib.php
course/view.php

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