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

[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/master
X-Git-Reftype: branch
X-Git-Oldrev: 052d0a976838b8ffaf1caf7a712cf5c03fd14bbf
X-Git-Newrev: a3a6e036b8ad9a9452097ee871622e2f49969577

The following commit has been merged in the master branch:
commit 8de166fa08776fd28e6c3ffbdb36150661531061
Merge: 052d0a976838b8ffaf1caf7a712cf5c03fd14bbf 162d3801cb646eb6cffb8d630693277e5e86e10b
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Jun 1 19:46:08 2016 +0200

    Merge tag 'upstream/2.2.4'
    
    Upstream version 2.2.4
    
    # gpg: Signature made Wed 01 Jun 2016 19:46:01 CEST using RSA key ID 6EA71993
    # gpg: Good signature from "Sebastian Ramacher <sebastian at ramacher.at>"
    # gpg:                 aka "Sebastian Ramacher <s.ramacher at gmail.com>"
    # gpg:                 aka "Sebastian Ramacher <s.ramacher at gmx.at>"
    # gpg:                 aka "Sebastian Ramacher <s.ramacher at student.tugraz.at>"
    # gpg:                 aka "Sebastian Ramacher <sramacher at debian.org>"
    # gpg:                 aka "Sebastian Ramacher <sebastian.ramacher at iaik.tugraz.at>"


-- 
VLC media player packaging