From: Sven Schöling <s.schoeling@linet-services.de>
Date: Tue, 3 Apr 2012 09:53:03 +0000 (+0200)
Subject: Merge remote-tracking branch 'cebitversion/kivitendo_style'
X-Git-Tag: release-3.0.0beta1~344^2~7
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=c707edd523dc852f3bd11008d64ab3cb1daca545;p=kivitendo-erp.git

Merge remote-tracking branch 'cebitversion/kivitendo_style'

Conflicts:
	SL/Form.pm
---

c707edd523dc852f3bd11008d64ab3cb1daca545