Merge branch 'wip-MDL-35770-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 15 Nov 2012 08:26:26 +0000 (16:26 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 15 Nov 2012 08:26:26 +0000 (16:26 +0800)
1  2 
course/lib.php

diff --cc course/lib.php
Simple merge