Merge branch 'wip-MDL-35884-master' of git://github.com/phalacee/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 11 Dec 2012 03:17:29 +0000 (11:17 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Dec 2012 03:17:29 +0000 (11:17 +0800)
1  2 
course/lib.php

diff --cc course/lib.php
Simple merge