From: Sven Schöling <s.schoeling@linet-services.de>
Date: Thu, 4 Mar 2010 13:11:21 +0000 (+0100)
Subject: Merge branch 'master' of ssh://lx-office/~/lx-office-erp
X-Git-Tag: release-2.6.1beta1~33^2~4^2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=f42b8272a31219ff145eafb007874b520c1fc3eb;p=kivitendo-erp.git

Merge branch 'master' of ssh://lx-office/~/lx-office-erp
---

f42b8272a31219ff145eafb007874b520c1fc3eb