From: Jan Büren <jan@lx-office-hosting.de>
Date: Thu, 25 Mar 2010 18:09:39 +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~355
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=3aa18afb97ebc1ff23a7b57ff3df6f968c57dd84;p=kivitendo-erp.git

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

3aa18afb97ebc1ff23a7b57ff3df6f968c57dd84