Merge branch 'MDL-36640-master' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 9 Dec 2012 22:42:57 +0000 (11:42 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 9 Dec 2012 22:42:57 +0000 (11:42 +1300)
1  2 
course/lib.php

diff --cc course/lib.php
Simple merge