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

Trivial merge