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