franck d02f13f021 Merge branch 'master' of https://github.com/thelia/thelia ...

Conflicts:
	core/lib/Thelia/Controller/Admin/ProductController.php
	core/lib/Thelia/Model/Product.php

2013-09-18 00:35:48 +02:00

..

default

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

2013-09-18 00:35:48 +02:00