From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 20 Sep 2010 15:40:36 +0000 (+0200)
Subject: Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~127
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=90edf0b1ddcc2aa9ee7cdeb9b46e1ccbea6b0006;p=kivitendo-erp.git

Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp
---

90edf0b1ddcc2aa9ee7cdeb9b46e1ccbea6b0006