Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Mon, 3 Jun 2013 11:50:52 +0000 (13:50 +0200)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Mon, 3 Jun 2013 11:50:52 +0000 (13:50 +0200)
1  2 
locale/de/all
templates/webpages/client_config/form.html

diff --cc locale/de/all
Simple merge