Manuel Raynaud 23c4a14d2c Merge branch 'master' of github.com:thelia/thelia ...

Conflicts:
	templates/admin/default/customer-edit.html

2013-10-28 15:41:48 +01:00

..

default

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

2013-10-28 15:41:48 +01:00