From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 23 Jul 2009 12:15:14 +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~342
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=0f5ce3851867ca5dab7893c32a089356b3bfd4f6;p=kivitendo-erp.git

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

0f5ce3851867ca5dab7893c32a089356b3bfd4f6