From: Jan Büren <jan@lx-office-hosting.de>
Date: Thu, 4 Mar 2010 08:58:27 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.1beta1~38
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=93c6ec51f6bb239eb52c3e0b0d1adf87f57796ee;p=kivitendo-erp.git

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

Conflicts:

	doc/changelog
---

93c6ec51f6bb239eb52c3e0b0d1adf87f57796ee