From: Jan Büren <jan@kivitendo-premium.de>
Date: Mon, 3 Nov 2014 12:52:07 +0000 (+0100)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.2.0beta~284
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/38044b51d435d611d602dfb1f80ea95543416ab4

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

38044b51d435d611d602dfb1f80ea95543416ab4