From: Sven Donath Date: Thu, 30 Sep 2010 15:04:46 +0000 (+0200) Subject: Merge branch 'master' of ssh://git-sdonath@lx-office.linet-services.de/~/lx-office... X-Git-Tag: release-2.6.2beta1~110^2~4 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=ee1d7e16868223bdeb2be45555b4d15545b53c7c;p=kivitendo-erp.git Merge branch 'master' of ssh://git-sdonath@lx-office.linet-services.de/~/lx-office-erp into printer_admin --- ee1d7e16868223bdeb2be45555b4d15545b53c7c