Merge branch 'wip-mdl-36131' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Oct 2012 23:24:31 +0000 (12:24 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Oct 2012 23:24:31 +0000 (12:24 +1300)
1  2 
course/lib.php

diff --cc course/lib.php
Simple merge