Merge branch 'MDL-36623-master-int' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 02:40:24 +0000 (10:40 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 02:40:24 +0000 (10:40 +0800)
commit981f72be5eda0fb297929c2a80d219bd84fb9a20
tree8b19959f046152bad5e16706e84b7e5dd81bc46a
parent2c59d2ca8c29cb548e3245392d50d2da5786da58
parent65edd8ad6d1d22a9505ef518ba99a2bf4b69ae5e
Merge branch 'MDL-36623-master-int' of git://github.com/FMCorz/moodle
course/lib.php
theme/base/style/course.css