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

[sramacher at users.alioth.debian.org]

Imported Upstream version 2.2.0~rc2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 63c302448dfaadeeb285a880ad9f8268b8cb09dd
X-Git-Newrev: 241394dcc5716cdc8f59851c551c061ce0b0248b

The following commit has been merged in the master branch:
commit e95aee4bcaeb54ee673506488ae55e4f2d382efb
Merge: 63c302448dfaadeeb285a880ad9f8268b8cb09dd 12f30e99e79900c55d02e50363bc0d4cd1db9447
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Nov 22 22:36:48 2014 +0100

    Merge tag 'upstream/2.2.0_rc2'
    
    Upstream version 2.2.0~rc2


-- 
VLC media player packaging