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

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

ebe71b37a511272a7e64c9bd06a6cc336480d224