From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 17 Jun 2013 15:31:31 +0000 (+0200)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~309^2~15
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=32f6b40f49f084318d614f868407c83c36f35e00;p=kivitendo-erp.git

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

32f6b40f49f084318d614f868407c83c36f35e00