Manuel Raynaud d6e1f99b35 Merge branch 'template' ...

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

2013-09-12 15:44:23 +02:00

..

casperjs

Merge branch 'template'

2013-09-12 15:44:23 +02:00