Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 7 Nov 2012 13:49:25 +0000 (14:49 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 7 Nov 2012 13:49:25 +0000 (14:49 +0100)
1  2 
locale/de/all

diff --cc locale/de/all
Simple merge