Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Tue, 24 May 2011 12:04:45 +0000 (14:04 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Tue, 24 May 2011 12:04:45 +0000 (14:04 +0200)

Trivial merge