From: Moritz Bunkus Date: Fri, 21 Jan 2011 11:06:06 +0000 (+0100) Subject: Merge branch 'master' of lx-office.linet-services.de:lx-office-erp X-Git-Tag: release-2.6.2beta2~2 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=f316caf09cb9280cf9b5990c0029328daf1e33b7;p=kivitendo-erp.git Merge branch 'master' of lx-office.linet-services.de:lx-office-erp --- f316caf09cb9280cf9b5990c0029328daf1e33b7