Merge branch 'master' of git@vc.linet-services.de:public/lx-office-erp
authorHolger Lindemann <hli@lenny.hoch.ul>
Thu, 5 Apr 2012 12:04:58 +0000 (14:04 +0200)
committerHolger Lindemann <hli@lenny.hoch.ul>
Thu, 5 Apr 2012 12:04:58 +0000 (14:04 +0200)

Trivial merge