From: Thomas Heck <theck@linet-services.de>
Date: Wed, 6 Mar 2013 15:43:59 +0000 (+0100)
Subject: Merge branch 'master' into dev
X-Git-Tag: release-3.1.0beta1~554^2~1^2~2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=49556f01cfe6a395cf5554e1a00dc61d6da0493e;p=kivitendo-erp.git

Merge branch 'master' into dev
---

49556f01cfe6a395cf5554e1a00dc61d6da0493e