Merge branch 'MDL-36092-master' of git://git.luns.net.uk/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 7 Nov 2012 08:56:11 +0000 (16:56 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 7 Nov 2012 08:56:11 +0000 (16:56 +0800)
1  2 
course/lib.php

diff --cc course/lib.php
Simple merge