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)
commitdc67f522cff23b0fb292966d99aab8a7006833f3
treee0c4c160dd97442460050562a65cdf84b88a0c09
parent382d11a43c202c4a92167ebcb2b60ea89f5acc02
parentddb16bdd38a53ec838401ccb14aaaf8b39ea48d8
Merge branch 'MDL-35634-master' of git://github.com/FMCorz/moodle
course/lib.php