[SCM] vlc/master: Merge tag 'upstream/2.2.0_pre4'

[sramacher at users.alioth.debian.org]

Imported Upstream version 2.2.0~pre4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a0c84d415cbfb29fe770ad7efe0f883651994707
X-Git-Newrev: d0d9b097ddf938acab564e4db433df8c572cbc3f

The following commit has been merged in the master branch:
commit 68706e1f1946323aed3018dd32177f6d321145f7
Merge: a0c84d415cbfb29fe770ad7efe0f883651994707 85fe39671c38134ed0fe06a807ffa30d7d19786c
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Oct 6 18:36:25 2014 +0200

    Merge tag 'upstream/2.2.0_pre4'
    
    Upstream version 2.2.0~pre4


-- 
VLC media player packaging