Manuel Raynaud 672b489418 Merge branch 'master' into template ...

Conflicts:
	templates/admin/default/customers.html
	templates/default/register.html

2013-09-10 17:09:22 +02:00

..

default

Merge branch 'master' into template

2013-09-10 17:09:22 +02:00