From: Moritz Bunkus <moritz@bunkus.org>
Date: Mon, 9 Aug 2010 09:51:24 +0000 (+0200)
Subject: Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~199
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=50fce01f2d49daf560e10d7e1e3c1f9bb8b8c59f;p=kivitendo-erp.git

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

50fce01f2d49daf560e10d7e1e3c1f9bb8b8c59f