Merge branch 'MDL-29044-master-3' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 30 Apr 2012 00:50:38 +0000 (12:50 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 30 Apr 2012 00:50:38 +0000 (12:50 +1200)
1  2 
course/lib.php

diff --cc course/lib.php
Simple merge