From: Jan Büren <jan@kivitendo-premium.de>
Date: Fri, 13 Dec 2013 13:00:45 +0000 (+0100)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~22^2~53^2^2~6
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=19064edf6bd7859e831fdf37cd465f7f933be6f3;p=kivitendo-erp.git

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

19064edf6bd7859e831fdf37cd465f7f933be6f3