Merge branch 'MDL-32881-master-2' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 14 May 2012 01:30:16 +0000 (13:30 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 14 May 2012 01:30:16 +0000 (13:30 +1200)
1  2 
course/lib.php

diff --cc course/lib.php
Simple merge