Merge branch 'tax_festsetzen'
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Fri, 22 Feb 2013 13:58:36 +0000 (14:58 +0100)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Fri, 22 Feb 2013 13:58:36 +0000 (14:58 +0100)
1  2 
locale/de/all
locale/en/all

diff --cc locale/de/all
Simple merge
diff --cc locale/en/all
Simple merge