From: Niclas Zimmermann Date: Mon, 6 Jan 2014 18:18:41 +0000 (+0100) Subject: Merge branch 'master' of https://github.com/kivitendo/kivitendo-erp X-Git-Tag: release-3.1.0beta1~22^2~40^2~1^2 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=a3f5ca64363e68adb11dfc93672b8786cd31801f;p=kivitendo-erp.git Merge branch 'master' of https://github.com/kivitendo/kivitendo-erp --- a3f5ca64363e68adb11dfc93672b8786cd31801f