Merge branch 'MDL-41188-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Sep 2013 18:04:08 +0000 (20:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Sep 2013 18:04:08 +0000 (20:04 +0200)
commit1ee2fb5a11b1d622502f08ea3f68785d84edd458
tree44ec583f21c987c2019d3b4353a6b6c767381a8e
parent58c9faeaca7213fe284b7999fc77bff313d90582
parent2a808cef8f98dce8ae3a88e69b9808e2e144c500
Merge branch 'MDL-41188-master' of git://github.com/damyon/moodle

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