From: Jan Büren <jan@lx-office-hosting.de>
Date: Tue, 17 May 2011 16:01:33 +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~19^2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=9516d554254a249d4fa70dab282da5f03df65548;p=kivitendo-erp.git

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

9516d554254a249d4fa70dab282da5f03df65548