From: Jan Büren <jan@lx-office-hosting.de>
Date: Fri, 13 May 2011 12:44:02 +0000 (+0200)
Subject: Merge branch 'master' of git://lx-office.linet-services.de/lx-office-erp
X-Git-Tag: release-2.6.3~25^2~35^2^2^2~1
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=f734534304287c27d97e58bc37009f1f17205c55;p=kivitendo-erp.git

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

f734534304287c27d97e58bc37009f1f17205c55