Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Wed, 7 Nov 2012 14:50:33 +0000 (15:50 +0100)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Wed, 7 Nov 2012 14:50:33 +0000 (15:50 +0100)

Trivial merge