Merge branch 'MDL-41175_M26' of git://github.com/lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 Sep 2013 03:50:38 +0000 (11:50 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Sep 2013 03:50:38 +0000 (11:50 +0800)
commitfff084b29f7cff39127f7037733a1a55467f70d9
tree571d460cd3b27ecd94202d8bee7612ec5f62dd9a
parent70189e7ad2022844f4d8775f10b1a013e5ffd79f
parentf021743ecba45280886308d4e949443e40bde546
Merge branch 'MDL-41175_M26' of git://github.com/lazydaisy/moodle

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