From: Jan Büren <jan@kivitendo-premium.de>
Date: Tue, 30 Oct 2012 09:53:20 +0000 (+0100)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta1~14^2~11^2~3
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=075bd42af8885aee3c18fe055a2c82b8b43f4cea;p=kivitendo-erp.git

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

075bd42af8885aee3c18fe055a2c82b8b43f4cea