Merge branch 'wip-mdl-41717' of git://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Sep 2013 19:22:30 +0000 (21:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Sep 2013 19:22:30 +0000 (21:22 +0200)
commit5c34952b821bafc9c8ace3c43b00db9ad8947ec9
treedf554119606a43a663a08c167678748d7e6033d4
parentcfcd93dd11d7335ff0b5116f2954fbd3a0dc9920
parent77063326e62c65162b2c3965feea53cc1f561057
Merge branch 'wip-mdl-41717' of git://github.com/rajeshtaneja/moodle

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