From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 10 Dec 2013 15:36:23 +0000 (+0100)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~22^2~98
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=8317fdf49404110c9f15c93d469c83e5bb0235e7;p=kivitendo-erp.git

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

8317fdf49404110c9f15c93d469c83e5bb0235e7