From: Holger Lindemann <hli@lenny.hoch.ul>
Date: Sat, 5 Mar 2011 10:17:49 +0000 (+0100)
Subject: Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
X-Git-Tag: release-2.6.3~53^2~3^2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=b3caa17585a69e0c5092483f709dd1227b9acaaf;p=kivitendo-erp.git

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

b3caa17585a69e0c5092483f709dd1227b9acaaf