From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 12 Mar 2013 12:00:03 +0000 (+0100)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~525
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/39d85854d0a01b19522366dc22e784b28a85f336

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

39d85854d0a01b19522366dc22e784b28a85f336