From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 30 Jan 2013 12:22:56 +0000 (+0100)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~664
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=2a201b355ff26058b8be59a92ce9c025cdf3a3bf;p=kivitendo-erp.git

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

2a201b355ff26058b8be59a92ce9c025cdf3a3bf