From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 10 May 2011 13:26:14 +0000 (+0200)
Subject: Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
X-Git-Tag: release-2.6.3~25^2~73
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=d86de2393007b186e5eecec870b051d4e740edf3;hp=-c;p=kivitendo-erp.git

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

d86de2393007b186e5eecec870b051d4e740edf3