From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 12 Nov 2012 10:25:52 +0000 (+0100)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta1~4^2~6
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=b74b299f5b0d77f0134c66078bbbcd0e7c93aeaf;p=kivitendo-erp.git

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

b74b299f5b0d77f0134c66078bbbcd0e7c93aeaf