From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 7 Jan 2014 08:43:43 +0000 (+0100)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~22^2~33^2~3
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=b0be688fa50e3f92526fdc281a663b19e52f6753;p=kivitendo-erp.git

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

b0be688fa50e3f92526fdc281a663b19e52f6753