[SCM] vlc/master: Merge tag 'upstream/2.1.1'

[bdrung at users.alioth.debian.org]

Imported Upstream version 2.1.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e11ee89ba7be92b7125ad4c142c849ab1db7971c
X-Git-Newrev: 2572c079a1315f131d42319ba8262a4faa037edf

The following commit has been merged in the master branch:
commit 95a699e72fabf8c5ee3b3829dc2ab89926077744
Merge: e11ee89ba7be92b7125ad4c142c849ab1db7971c 4d32c550802f7c23ecde52d28b8ccd3cad9e144a
Author: Benjamin Drung <bdrung at debian.org>
Date:   Mon Nov 18 01:26:44 2013 +0100

    Merge tag 'upstream/2.1.1'
    
    Upstream version 2.1.1


-- 
VLC media player packaging