Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
authorHolger Lindemann <hli@lenny.hoch.ul>
Fri, 3 Jun 2011 06:28:18 +0000 (08:28 +0200)
committerHolger Lindemann <hli@lenny.hoch.ul>
Fri, 3 Jun 2011 06:28:18 +0000 (08:28 +0200)

Trivial merge