Merge branch 'MDL-35634-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 7 Oct 2012 22:36:57 +0000 (11:36 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 7 Oct 2012 22:36:57 +0000 (11:36 +1300)
1  2 
course/lib.php

diff --cc course/lib.php
Simple merge