Merge branch 'master' of git@vc.linet-services.de:public/lx-office-erp
authorHolger Lindemann <hli@lenny.hoch.ul>
Fri, 10 Feb 2012 17:46:35 +0000 (18:46 +0100)
committerHolger Lindemann <hli@lenny.hoch.ul>
Fri, 10 Feb 2012 17:46:35 +0000 (18:46 +0100)

Trivial merge