From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 3 Mar 2010 16:11:55 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.1beta1~38^2~3
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=2b7ababfda8164a78a45e80fc2ec74672e6628d4;p=kivitendo-erp.git

Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp
---

2b7ababfda8164a78a45e80fc2ec74672e6628d4