Merge branch 'master' of git@vc.linet-services.de:public/lx-office-erp
authorHolger Lindemann <hli@lenny.hoch.ul>
Mon, 25 Jun 2012 16:42:07 +0000 (18:42 +0200)
committerHolger Lindemann <hli@lenny.hoch.ul>
Mon, 25 Jun 2012 16:42:07 +0000 (18:42 +0200)

Trivial merge