Merge branch 'MDL-36417-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 15 Nov 2012 02:39:08 +0000 (10:39 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 15 Nov 2012 02:39:08 +0000 (10:39 +0800)
1  2 
course/lib.php

diff --cc course/lib.php
Simple merge