Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorBernd Blessmann <bibi@online.de>
Fri, 11 May 2012 20:46:50 +0000 (22:46 +0200)
committerBernd Blessmann <bibi@online.de>
Fri, 11 May 2012 20:46:50 +0000 (22:46 +0200)

Trivial merge