From: Jan Büren <jan@kivitendo-premium.de>
Date: Fri, 30 Jan 2015 14:32:28 +0000 (+0100)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.2.0beta~6
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/fcade7254d366eb6483b5640947589d989f01c95

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

fcade7254d366eb6483b5640947589d989f01c95