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