Merge branch '42247-26' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Oct 2013 01:32:27 +0000 (09:32 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Oct 2013 01:32:27 +0000 (09:32 +0800)
commitbd81762784a3b5147b64a0cb9e5a8c56bd8c101f
tree40824d7f74b4686d657639f036f9eee52fed6370
parent30fb3994553d7e9a2288e438f66cd6edb0915ab9
parent0c80d689a68238fe6b6f0cfed54cd5e5ed32b64b
Merge branch '42247-26' of git://github.com/samhemelryk/moodle

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