From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 2 Sep 2014 07:35:59 +0000 (+0200)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.2.0beta~325
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=22cf5fb67293f9bde99b9f0a48f982e3d396d3bd;p=kivitendo-erp.git

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

22cf5fb67293f9bde99b9f0a48f982e3d396d3bd