From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 30 Dec 2010 14:41:16 +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~7
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=b6aa691e35aafda0ea25410b326e92b1216ad247;p=kivitendo-erp.git

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

b6aa691e35aafda0ea25410b326e92b1216ad247