Merge branch 'MDL-41125-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Aug 2013 09:10:05 +0000 (17:10 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Aug 2013 09:10:05 +0000 (17:10 +0800)
1  2 
course/lib.php

diff --cc course/lib.php
Simple merge