[SCM] vlc/jessie: Merge tag 'upstream/2.2.4' into jessie

[sramacher at users.alioth.debian.org]

Imported Upstream version 2.2.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/jessie
X-Git-Reftype: branch
X-Git-Oldrev: 6e000b031fab9ed259bb8cee94d23a696f420dfc
X-Git-Newrev: 6e1e803f264a2485b68a0e5c7fc137585d59f571

The following commit has been merged in the jessie branch:
commit 85f3d84ecc11c7cb7782a66e27ec1b9449fddf7f
Merge: f80b6b51c53275ceb9241e638194f936d17fc608 162d3801cb646eb6cffb8d630693277e5e86e10b
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Thu Jun 2 22:35:28 2016 +0200

    Merge tag 'upstream/2.2.4' into jessie
    
    Upstream version 2.2.4


-- 
VLC media player packaging