Merge branch 'MDL-33063' of git://github.com/srynot4sale/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 24 May 2012 12:32:31 +0000 (20:32 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 24 May 2012 12:32:31 +0000 (20:32 +0800)
1  2 
course/lib.php

diff --cc course/lib.php
Simple merge