Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
authorHolger Lindemann <hli@lenny.hoch.ul>
Sat, 5 Mar 2011 10:17:49 +0000 (11:17 +0100)
committerHolger Lindemann <hli@lenny.hoch.ul>
Sat, 5 Mar 2011 10:17:49 +0000 (11:17 +0100)

Trivial merge