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

[bdrung at users.alioth.debian.org]

Imported Upstream version 2.1.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3cef1bf178786927315f5033587b0926821b4b1b
X-Git-Newrev: ab039abdf47b63d975c34fe2c63f0ec4c1992595

The following commit has been merged in the master branch:
commit 5bcbe7d41e6c9866ad65302ed4de7e6380d9ba33
Merge: 3cef1bf178786927315f5033587b0926821b4b1b 5bb210bdcd483dc2ade295ef60c44249c7a1995c
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sat Dec 21 17:50:54 2013 +0100

    Merge tag 'upstream/2.1.2'
    
    Upstream version 2.1.2


-- 
VLC media player packaging