Manuel Raynaud 0c24a8afc0 Merge branch 'master' into modules ...

Conflicts:
	templates/backOffice/default/product-edit.html

2013-12-17 10:48:59 +01:00

..

Thelia

Merge branch 'master' into modules

2013-12-17 10:48:59 +01:00