From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 30 Dec 2010 15:12:07 +0000 (+0100)
Subject: Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~17^2~4
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=95ecb4289e58990f441f0273182c55f45f26bfb6;p=kivitendo-erp.git

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

95ecb4289e58990f441f0273182c55f45f26bfb6