From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Fri, 5 Mar 2010 14:02:06 +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~12^2~4
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=ee9e20c67e0e2f295c725b939ecf9b08552f5aa8;p=kivitendo-erp.git

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

ee9e20c67e0e2f295c725b939ecf9b08552f5aa8