Merge branch 'MDL-32875-master-1' of git://git.luns.net.uk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 May 2012 05:08:40 +0000 (13:08 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 14 May 2012 05:08:40 +0000 (13:08 +0800)
1  2 
course/lib.php

diff --cc course/lib.php
Simple merge