From: Jan Büren <jan@lx-office-hosting.de>
Date: Mon, 16 Jan 2012 14:46:34 +0000 (+0100)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-2.7.0beta1~32^2~5
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=db9117394fe3be8279ab1becdb2b71d0de885063;p=kivitendo-erp.git

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

db9117394fe3be8279ab1becdb2b71d0de885063