From: Jan Büren <jan@lx-office-hosting.de>
Date: Thu, 27 Oct 2011 12:17:29 +0000 (+0200)
Subject: Merge branch 'master' of git@vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-2.7.0beta1~194^2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=6ae13887a4bd2fb056010ae7bd22b652c8c5d116;p=kivitendo-erp.git

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

6ae13887a4bd2fb056010ae7bd22b652c8c5d116