Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
authorHolger Lindemann <hli@lenny.hoch.ul>
Fri, 4 Feb 2011 13:25:29 +0000 (14:25 +0100)
committerHolger Lindemann <hli@lenny.hoch.ul>
Fri, 4 Feb 2011 13:25:29 +0000 (14:25 +0100)

Trivial merge