From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 25 Feb 2013 08:31:50 +0000 (+0100)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~608
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=067e94571b0f00cbb77c6b6fbeb1ed5e1e31402e;p=kivitendo-erp.git

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

067e94571b0f00cbb77c6b6fbeb1ed5e1e31402e