From: Niclas Zimmermann Date: Fri, 14 Jun 2013 09:29:13 +0000 (+0200) Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp X-Git-Tag: release-3.1.0beta1~332 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;ds=inline;h=353bc0fa211e89cacaafecd3c148201c12f07251;p=kivitendo-erp.git Merge branch 'master' of github.com:kivitendo/kivitendo-erp --- 353bc0fa211e89cacaafecd3c148201c12f07251