From: Jan Büren <jan@kivitendo-premium.de>
Date: Tue, 25 Nov 2014 17:10:17 +0000 (+0100)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.2.0beta~226
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/e3810fbd565d14993f6b5a6fe89f0e4e27c95869

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

e3810fbd565d14993f6b5a6fe89f0e4e27c95869