From: Holger Lindemann <hli@lx-system.de>
Date: Wed, 27 Oct 2010 05:30:12 +0000 (+0200)
Subject: Merge branch 'master' of ssh://lx-office/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~89^2~6
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=6f2893dcf199d5e5147cc2020c2ab6984f4274dc;p=kivitendo-erp.git

Merge branch 'master' of ssh://lx-office/~/lx-office-erp
---

6f2893dcf199d5e5147cc2020c2ab6984f4274dc