From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 4 Jan 2011 14:51:26 +0000 (+0100)
Subject: Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/bad748223730995fa71dbfab34ae4a238d6992ed

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

bad748223730995fa71dbfab34ae4a238d6992ed