[SCM] vlc/master: Merge paragraphs

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a2eea4f17adb91c57866025b9bce422222ed93e6
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Fri Dec 1 02:18:05 2017 +0100

    Merge paragraphs

diff --git a/debian/copyright b/debian/copyright
index 34f923f..244ad4a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -939,9 +939,11 @@ License: BSD-3-clause
 Comment:
  See https://perspx.com/work/
 
-Files: share/lua/http/js/jquery.jstree.js
+Files: share/lua/http/css/ui-lightness/jquery-ui-1.8.13.custom.css
+       share/lua/http/js/jquery.jstree.js
 Copyright: 2010, Ivan Bozhanov
-License: Expat or GPL-2+
+           2010-2011, jQuery UI authors
+License: Expat or GPL-2
 
 Files: Makefile.in
        autotools/*
@@ -1151,10 +1153,6 @@ Copyright: protonux
            Vincent Schüßler
 License: WTFPL
 
-Files: share/lua/http/css/ui-lightness/jquery-ui-1.8.13.custom.css
-Copyright: 2010-2011, AUTHORS.txt (http://jqueryui.com/about)
-License: MIT or GPL-2
-
 Files: modules/access/v4l2/linux/v4l2-common.h
 Copyright: 2012, Nokia Corporation
 License: GPL-2

-- 
VLC media player packaging