Etienne Roudeix a647bfd016 Merge branch 'master' into tax ...

Conflicts:
	local/config/schema.xml

2013-09-27 13:35:39 +02:00

..

lib/Thelia

Merge branch 'master' into tax

2013-09-27 13:35:39 +02:00

bootstrap.php

Product loop adjustements

2013-08-01 10:53:35 +02:00