From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 2 Feb 2011 14:16:36 +0000 (+0100)
Subject: Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
X-Git-Tag: release-2.6.2~2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=1979917f9608da84bda5b8dfcb1719820d335a75;p=kivitendo-erp.git

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

1979917f9608da84bda5b8dfcb1719820d335a75