From: Sven Schöling <s.schoeling@linet-services.de>
Date: Wed, 29 Dec 2010 12:50:19 +0000 (+0100)
Subject: Merge branch 'master' of ssh://lx-office/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~46
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=fdcb76f43fd064f9b8781515a7cb3b23c5298b6b;p=kivitendo-erp.git

Merge branch 'master' of ssh://lx-office/~/lx-office-erp
---

fdcb76f43fd064f9b8781515a7cb3b23c5298b6b