From: Jan Büren <jan@kivitendo-premium.de>
Date: Fri, 24 Jul 2015 11:11:25 +0000 (+0200)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.3.0beta~31
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/4247547d2a925ddad7006cae89e5f9f1fda7d469

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

4247547d2a925ddad7006cae89e5f9f1fda7d469