Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorWulf <wulf@coulmann.de>
Tue, 10 Jan 2012 16:17:45 +0000 (17:17 +0100)
committerWulf <wulf@coulmann.de>
Tue, 10 Jan 2012 16:17:45 +0000 (17:17 +0100)

Trivial merge