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

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

f46bab538d8953b357098ca4ff9ace670d9b0d55