pl
Merge branch 'master' of https://github.com/fvaron/zencart_fr

Conflicts:
	.htaccess

merge ok
m Pleas enter the commit message for your changes. Lines starting
f
lovine
Merge branch 'master' of https://github.com/fvaron/zencart_fr