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

Conflicts:
	core/lib/Thelia/Form/CustomerCreation.php
	templates/admin/default/customers.html

2013-09-10 16:44:24 +02:00

..

Thelia

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

2013-09-10 16:44:24 +02:00