From: Jan Büren <jan@lx-office-hosting.de>
Date: Thu, 12 May 2011 13:11:32 +0000 (+0200)
Subject: Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
X-Git-Tag: release-2.6.3~25^2~40
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=1740411d06cfea8f43fce1db3e7fa08b7ceb262e;p=kivitendo-erp.git

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

1740411d06cfea8f43fce1db3e7fa08b7ceb262e