From: bernd <bernd@lxbug.(none)>
Date: Tue, 28 Dec 2010 13:56:19 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git-bblessmann@lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~42^2~14^2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=d4d5310fce0457dde54ae98cf2ca01e5dd9d8e31;p=kivitendo-erp.git

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

d4d5310fce0457dde54ae98cf2ca01e5dd9d8e31