From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Fri, 2 Oct 2009 15:19:55 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.1beta1~251
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=bc71c253714824c3f1bd5749958302dce5555762;p=kivitendo-erp.git

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

bc71c253714824c3f1bd5749958302dce5555762