From: Sven Donath <lxo@dexo.de>
Date: Mon, 12 Nov 2012 17:30:26 +0000 (+0100)
Subject: Merge branch 'master', remote branch 'origin'
X-Git-Tag: release-3.0.0beta2~14
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=781c16772f3c80cc827f11815bfb07b8318621f0;p=kivitendo-erp.git

Merge branch 'master', remote branch 'origin'
---

781c16772f3c80cc827f11815bfb07b8318621f0