Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Fri, 9 Nov 2012 12:00:59 +0000 (13:00 +0100)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Fri, 9 Nov 2012 12:00:59 +0000 (13:00 +0100)

Trivial merge