From: Michael Wagner <michael@wagnertech.de>
Date: Mon, 6 Feb 2017 21:07:11 +0000 (+0100)
Subject: Merge branch 'master' of http://wagnertech.de/git/kivitendo-erp
X-Git-Tag: t4
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=refs%2Ftags%2Ft4;p=kivitendo-erp.git

Merge branch 'master' of wagnertech.de/git/kivitendo-erp
---

830524e882557bf83864989fc471985ea7d8de70