From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 6 Oct 2010 08:33:28 +0000 (+0200)
Subject: Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~106
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=4cbe32ff62fcce20fff876292ace807c5a61535b;p=kivitendo-erp.git

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

4cbe32ff62fcce20fff876292ace807c5a61535b