Merge branch 'gewicht'
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Mon, 3 Jun 2013 11:49:40 +0000 (13:49 +0200)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Mon, 3 Jun 2013 11:49:40 +0000 (13:49 +0200)
commitc6b2257945060625bcb86fa7e2efd27c737480ff
tree3f4a60576138d1a6bf625d47da78a6cdeececef3
parent9be2155c4e7ee8ea2c000b8fb20110d5e9bd97cc
parent68610badb49a0bcb03acea594a236e1812cdb869
Merge branch 'gewicht'

Conflicts:
SL/Controller/ClientConfig.pm
SL/DB/MetaSetup/Default.pm
SL/Controller/ClientConfig.pm
SL/DB/Helper/FlattenToForm.pm
SL/DB/MetaSetup/Default.pm
SL/DO.pm
SL/IS.pm
SL/OE.pm
locale/de/all
templates/webpages/client_config/form.html