Manuel Raynaud d213278fe3 Merge branch 'master' into actions ...

Conflicts:
	core/lib/Thelia/Action/BaseAction.php
	core/lib/Thelia/Action/Category.php
	core/lib/Thelia/Action/Customer.php

2013-08-09 16:46:56 +02:00

..

Thelia

Merge branch 'master' into actions

2013-08-09 16:46:56 +02:00