Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
authorroman <roman@omega.ok-it-services.de>
Tue, 16 Aug 2011 22:23:44 +0000 (00:23 +0200)
committerroman <roman@omega.ok-it-services.de>
Tue, 16 Aug 2011 22:23:44 +0000 (00:23 +0200)

Trivial merge