Merge branch 'wip-MDL-40974-m26' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Aug 2013 07:13:02 +0000 (15:13 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Aug 2013 07:13:02 +0000 (15:13 +0800)
1  2 
course/lib.php

diff --cc course/lib.php
Simple merge