From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 29 Jun 2011 08:46:14 +0000 (+0200)
Subject: Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
X-Git-Tag: release-2.7.0beta1~357
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=ad9811f427c748aae4874b9f746fdce3568d94ef;p=kivitendo-erp.git

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

ad9811f427c748aae4874b9f746fdce3568d94ef