From: Sven Schöling <s.schoeling@linet-services.de>
Date: Wed, 17 Mar 2010 10:48:34 +0000 (+0100)
Subject: Merge branch 'master' of ssh://lx-office/~/lx-office-erp
X-Git-Tag: release-2.6.1~12^2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/df1367050aebe74cbcabaa176a20edaca65208b4?hp=--cc

Merge branch 'master' of ssh://lx-office/~/lx-office-erp
---

df1367050aebe74cbcabaa176a20edaca65208b4