From: Holger Lindemann <hli@debian7.lx-system.de>
Date: Fri, 24 Jan 2014 09:09:33 +0000 (+0100)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~21
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=abe89aaca4356b4860f4623410e70f50b3c4d631;p=kivitendo-erp.git

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

abe89aaca4356b4860f4623410e70f50b3c4d631