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

[bdrung at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 330f2b5846e025275873b6edc61f450cb5b817fc
Merge: b4fadc284f0afed0d9d2d44804ebfb9964f4eaa1 e0c5a16e7d85162205eb8cd46d436314a993a622
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sun May 11 00:35:09 2014 +0200

    Merge tag 'upstream/2.1.4'
    
    Upstream version 2.1.4


-- 
VLC media player packaging