From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 4 Mar 2010 13:19:28 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.1beta1~33^2~4
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/f11dcc70cd323fe2071ea62b53fc0ec106c3c02d?hp=f11dcc70cd323fe2071ea62b53fc0ec106c3c02d

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

Conflicts:
	doc/changelog
---