From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Fri, 31 Aug 2012 11:40:53 +0000 (+0200)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta1~262
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/cf6c2739f2a7495121ed95e165ecbf2f060609f6?hp=-c

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

cf6c2739f2a7495121ed95e165ecbf2f060609f6