From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 28 Dec 2010 13:18:44 +0000 (+0100)
Subject: Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~55^2~5
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=961d72dfa6a8e56758842123944a3f5ad42adae4;p=kivitendo-erp.git

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

961d72dfa6a8e56758842123944a3f5ad42adae4