htaccess
Merge branch 'master' of github.com:sambolek/magento