From: Sven Schöling <s.schoeling@linet-services.de>
Date: Mon, 6 Jan 2014 12:46:11 +0000 (+0100)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~22^2~51^2~7
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=4bf8886f5004121c1fb31cbb93907dee44005c57;p=kivitendo-erp.git

Merge branch 'master' of github.com:kivitendo/kivitendo-erp
---

4bf8886f5004121c1fb31cbb93907dee44005c57