From: Sven Schöling <s.schoeling@linet-services.de>
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/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/e4b304dc48811f510271de1a3ea242ce1cb30654

Merge branch 'master' of github.com:kivitendo/kivitendo-erp

Conflicts:
	SL/Template/Plugin/JavaScript.pm
---

e4b304dc48811f510271de1a3ea242ce1cb30654