From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 16 Jan 2012 16:31:11 +0000 (+0100)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-2.7.0beta1~49^2~1
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=42b47796d850427b287926794015e0ed9a6656d1;p=kivitendo-erp.git

Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
---

42b47796d850427b287926794015e0ed9a6656d1
diff --cc doc/Lx-Office-Dokumentation.pdf
index 00ec0d53f,000000000..0fec00ee5
mode 100644,000000..100644
Binary files differ