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

[sramacher at users.alioth.debian.org]

Imported Upstream version 2.2.0~rc1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3e9fef97329ac285f646118f178322d82ae8713b
X-Git-Newrev: 6f87998f33e034a7cbdd096266742099e863ef9a

The following commit has been merged in the master branch:
commit e6e1560eeb021a5eac63f07fb77aef14b190d407
Merge: 3e9fef97329ac285f646118f178322d82ae8713b 8a37b941c5ab46444850b8ebf0f8a31369e4cd8c
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Nov 3 18:30:42 2014 +0100

    Merge tag 'upstream/2.2.0_rc1'
    
    Upstream version 2.2.0~rc1


-- 
VLC media player packaging