From: Sven Schöling Date: Mon, 15 Jul 2013 16:49:53 +0000 (+0200) Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp X-Git-Tag: release-3.1.0beta1~161^2^2~51 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=e4b304dc48811f510271de1a3ea242ce1cb30654;p=kivitendo-erp.git Merge branch 'master' of github.com:kivitendo/kivitendo-erp Conflicts: SL/Template/Plugin/JavaScript.pm --- e4b304dc48811f510271de1a3ea242ce1cb30654