From: Jan Büren <jan@lx-office-hosting.de>
Date: Mon, 25 Oct 2010 14:18:21 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~92
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=7cf894f137fa5e4a2679b8a6e1aa00566041f9e4;p=kivitendo-erp.git

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

7cf894f137fa5e4a2679b8a6e1aa00566041f9e4