Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorBernd Blessmann <bibi@online.de>
Wed, 11 Jan 2012 10:39:24 +0000 (11:39 +0100)
committerBernd Blessmann <bibi@online.de>
Wed, 11 Jan 2012 10:39:24 +0000 (11:39 +0100)

Trivial merge