Merge branch 'MDL-41615_c' of git://github.com/rwijaya/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 7 Nov 2013 09:17:32 +0000 (17:17 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 7 Nov 2013 09:17:32 +0000 (17:17 +0800)
commit48fe93fa26e76d7b7f0791fe2b38ae503b78819f
tree1e356a0b6121d29b5a2de2c2d6b84b9cb3eb6620
parentd1cfb36b59c36c47cc19e27c202ee91a24eca302
parentc544ee92f50e83c42d1e8d44beadcac6a322f102
Merge branch 'MDL-41615_c' of git://github.com/rwijaya/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
mod/quiz/styles.css
theme/base/style/core.css
theme/bootstrapbase/less/moodle/core.less
theme/bootstrapbase/style/moodle.css