css修改
Merge branch 'master' of https://github.com/Joyguo0/magento1810

Conflicts:
	skin/frontend/bootstrapped/default/css/mintai.css
Merge branch 'master' of https://github.com/Joyguo0/magento1810
6.6css修改
6.6 css修改2
Merge pull request #38 from chenlihua/master

6.6css修改