Merge branch 'wip-MDL-41517-master' of git://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 9 Sep 2013 04:43:32 +0000 (12:43 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 9 Sep 2013 04:43:32 +0000 (12:43 +0800)
1  2 
course/lib.php

diff --cc course/lib.php
Simple merge