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

[mati75-guest at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit d06479aecd4fc9f0578ea72583f33d8f2b45bff0
Merge: 1d9427940c87132c57541bf501f651806a6b6c91 062ec8e0e38c3f8118eb3319433192ca399fb561
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Fri Feb 27 22:40:50 2015 +0100

    Merge tag 'upstream/2.2.0'
    
    Upstream version 2.2.0


-- 
VLC media player packaging