From: Sven Donath <lxo@dexo.de>
Date: Thu, 18 Oct 2012 11:09:32 +0000 (+0200)
Subject: Merge branch 'master', remote branch 'origin'
X-Git-Tag: release-3.0.0beta1~110
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=6a268229744c1a25a9c33f44bc2e4bc8c041bc14;p=kivitendo-erp.git

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