Etienne Roudeix 3b433a0c8d Merge branch 'master' into tax ...

Conflicts:
	templates/default_save/product.html

2013-09-10 19:15:15 +02:00

..

Thelia

Merge branch 'master' into tax

2013-09-10 19:15:15 +02:00