From: Sven Donath <lxo@dexo.de>
Date: Thu, 25 Oct 2012 15:21:37 +0000 (+0200)
Subject: Merge branch 'master', remote branch 'origin'
X-Git-Tag: release-3.0.0beta2~15
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=c2f911bdbad03f7b81e0121e4e866bb96586168c;p=kivitendo-erp.git

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