From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 3 Mar 2010 12:11:50 +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~48^2~5
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=fc96e3c77cd070fe249fb885d0bddee64c3f806f;p=kivitendo-erp.git

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

fc96e3c77cd070fe249fb885d0bddee64c3f806f