From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Fri, 22 Jul 2011 10:57:28 +0000 (+0200)
Subject: Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
X-Git-Tag: release-2.7.0beta1~353
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=5aaa3c621371557ed9fde80ef6a07e2b7959c0cb;p=kivitendo-erp.git

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

5aaa3c621371557ed9fde80ef6a07e2b7959c0cb