From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 30 Dec 2010 10:19:51 +0000 (+0100)
Subject: Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~35
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=c22f33d9690d04557773c5594c4158384e4889dd;p=kivitendo-erp.git

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

c22f33d9690d04557773c5594c4158384e4889dd