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

Conflicts:
	templates/admin/default/customers.html

2013-09-13 11:59:21 +02:00

..

default

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

2013-09-13 11:59:21 +02:00