Merge branch 'wip-MDL-37028-master' of git://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 10 Sep 2013 04:51:33 +0000 (12:51 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 10 Sep 2013 04:51:33 +0000 (12:51 +0800)
1  2 
course/lib.php
course/tests/courselib_test.php

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