Etienne Roudeix 622e1ca3b6 Merge branch 'master' into tax ...

Conflicts:
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Model/Base/AttributeTemplate.php
	core/lib/Thelia/Model/Base/AttributeTemplateQuery.php
	core/lib/Thelia/Model/Map/AttributeTemplateTableMap.php
	install/thelia.sql
	local/config/schema.xml

2013-09-27 10:29:51 +02:00

..

default

Merge branch 'master' into tax

2013-09-27 10:29:51 +02:00