From: Thomas Heck <theck@linet-services.de>
Date: Thu, 28 Feb 2013 08:58:35 +0000 (+0100)
Subject: Merge branch 'master' into dev
X-Git-Tag: release-3.1.0beta1~554^2~1^2~6
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=50868b23fa58529558fd1cf3030e586f988c27ac;p=kivitendo-erp.git

Merge branch 'master' into dev
---

50868b23fa58529558fd1cf3030e586f988c27ac