From: Thomas Heck <theck@linet-services.de>
Date: Wed, 12 Dec 2012 15:07:29 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Tag: release-3.1.0beta1~784
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=0fe866714abb2a0a63653afcded66b89d0ebe69f;p=kivitendo-erp.git

Merge branch 'dev'
---

0fe866714abb2a0a63653afcded66b89d0ebe69f