Merge branch 'MDL-40975-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 6 Nov 2013 05:06:01 +0000 (13:06 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 6 Nov 2013 05:06:01 +0000 (13:06 +0800)
commit951b414b658d55f76f774feeddd778d0fb2e7a85
tree6512b5daefe90e87fdc022fb35cade30e177e111
parentc32ba4e2fbd4737331db5eeca36419b21f32edd4
parent1e5620a62b9fe393055479398416e020e89a82a9
Merge branch 'MDL-40975-master' of git://github.com/andrewnicols/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
course/classes/management_renderer.php
lang/en/moodle.php
theme/base/style/course.css
theme/bootstrapbase/less/moodle/course.less
theme/bootstrapbase/style/moodle.css