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

[bdrung at users.alioth.debian.org]

Imported Upstream version 2.2.0~pre3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 714d69ee6df56f2815d4e673412986a0145c9579
X-Git-Newrev: 19cc984fb0ee99fe2b624e86989a5f1572a9557b

The following commit has been merged in the master branch:
commit 0c020f08d4ca87b8800a028f0d35c8020d3cee86
Merge: 714d69ee6df56f2815d4e673412986a0145c9579 c98f530b7a31bf7823fc90a7effd82da66bc5abe
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sat Sep 6 20:53:30 2014 +0200

    Merge tag 'upstream/2.2.0_pre3'
    
    Upstream version 2.2.0~pre3


-- 
VLC media player packaging