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

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

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

The following commit has been merged in the master branch:
commit e9083777ded66e014743c8086eaa8432f98dbdba
Merge: f88ca9e1269cfc34878c04166bf91012b251fefd 24e1ff6f0f1300809347a5226332b8184006acc7
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Thu Apr 16 19:36:00 2015 +0200

    Merge tag 'upstream/2.2.1'
    
    Upstream version 2.2.1


-- 
VLC media player packaging