From: Moritz Bunkus Date: Fri, 5 Mar 2010 10:29:02 +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~20 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=df956e31b1c10d194b1a2784147344684ec0efff;p=kivitendo-erp.git Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp --- df956e31b1c10d194b1a2784147344684ec0efff