From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 23 Jun 2011 12:12:05 +0000 (+0200)
Subject: Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
X-Git-Tag: release-2.7.0beta1~365
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=0a612d2fe7ec14c9ed3f7d0d036e1c63d3027f4f;p=kivitendo-erp.git

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

0a612d2fe7ec14c9ed3f7d0d036e1c63d3027f4f