Merge branch 'MDL-42851' of git://github.com/rwijaya/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 26 Nov 2013 06:48:21 +0000 (14:48 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 26 Nov 2013 06:48:21 +0000 (14:48 +0800)
commitfb9c770d8d4b3c4a288184a83b2bc203ffd7ffce
treed745cbc589dfec6689618913428245a993774e54
parent6ac888c5f214a0919a39950af0f5e4c596a731ca
parent1b136466bf0c330a0f4038d189a3aaea697f17db
Merge branch 'MDL-42851' of git://github.com/rwijaya/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
theme/bootstrapbase/less/moodle/course.less
theme/bootstrapbase/style/moodle.css