Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
authorHolger Lindemann <hli@lenny.hoch.ul>
Mon, 14 Mar 2011 13:55:07 +0000 (14:55 +0100)
committerHolger Lindemann <hli@lenny.hoch.ul>
Mon, 14 Mar 2011 13:55:07 +0000 (14:55 +0100)

Trivial merge