From: Sven Schöling Date: Fri, 5 Mar 2010 12:48:29 +0000 (+0100) Subject: Merge branch 'master' of ssh://lx-office/~/lx-office-erp X-Git-Tag: release-2.6.1beta1~17^2 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/ac4d2ca19405fc1c6d8580af147e233dcf46c5b9?hp=ac4d2ca19405fc1c6d8580af147e233dcf46c5b9 Merge branch 'master' of ssh://lx-office/~/lx-office-erp Conflicts: doc/changelog ---