From: Jan Büren <jan@lx-office-hosting.de>
Date: Sat, 18 Dec 2010 13:14:24 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~69^2~1
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=0f83109985b416d2e18e472ede54e4f633ed3596;p=kivitendo-erp.git

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

0f83109985b416d2e18e472ede54e4f633ed3596