From: Jan Büren <jan@lx-office-hosting.de>
Date: Tue, 28 Dec 2010 14:06:19 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~42^2~12^2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=27557af4df09feccf6cb4e40b06af01102d029b1;p=kivitendo-erp.git

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

27557af4df09feccf6cb4e40b06af01102d029b1