Manuel Raynaud 0c564be4c5 Merge branch 'master' of https://github.com/enurit/thelia into enurit-master ...

Conflicts:
	templates/frontOffice/default/I18n/fr_FR.php

2014-01-14 19:21:01 +01:00

..

Thelia

Merge branch 'master' of https://github.com/enurit/thelia into enurit-master

2014-01-14 19:21:01 +01:00