From: Jan Büren <jan@kivitendo-premium.de>
Date: Fri, 27 Jun 2014 11:48:32 +0000 (+0200)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.2.0beta~411
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/fa7fc7eeb3ca718914affee06c0629a08d571288

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

fa7fc7eeb3ca718914affee06c0629a08d571288