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

[sramacher at users.alioth.debian.org]

New upstream version 2.2.5.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: aa80be306c136b9624878844e3addeed76e78e65
X-Git-Newrev: f235525df859f509de52b9f8bfaf7d418f61d9ee

The following commit has been merged in the master branch:
commit 9f97a7d5ee86b67a0bc2d8dfac4fcb7598897216
Merge: aa80be306c136b9624878844e3addeed76e78e65 9cb5e1e70acb5c32be70ebd88ba2133261cee5ec
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Thu May 11 18:35:19 2017 +0200

    Merge tag 'upstream/2.2.5.1'
    
    Upstream version 2.2.5.1
    
    # gpg: Signature made 2017-05-11T18:35:13 CEST
    # gpg:                using RSA key F78CBA07817BB149A11D339069F2FC516EA71993
    # gpg:                issuer "sramacher at debian.org"
    # gpg: Good signature from "Sebastian Ramacher <sebastian at ramacher.at>" [ultimate]
    # gpg:                 aka "Sebastian Ramacher <s.ramacher at gmail.com>" [ultimate]
    # gpg:                 aka "Sebastian Ramacher <s.ramacher at gmx.at>" [ultimate]
    # gpg:                 aka "Sebastian Ramacher <s.ramacher at student.tugraz.at>" [ultimate]
    # gpg:                 aka "Sebastian Ramacher <sramacher at debian.org>" [ultimate]
    # gpg:                 aka "Sebastian Ramacher <sebastian.ramacher at iaik.tugraz.at>" [ultimate]


-- 
VLC media player packaging