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

[sramacher at users.alioth.debian.org]

New upstream version 2.2.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b50946000708bac84ec4284709f97a7cc33c6c86
X-Git-Newrev: 1649ac58db71804c0736c43cc9b218c9a54ea1ab

The following commit has been merged in the master branch:
commit a75f42a339d019cab990b1cbc6d5e60995f178a3
Merge: b50946000708bac84ec4284709f97a7cc33c6c86 245be92b33b7be733f4007c7323033dd4c27bec7
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Mar 19 21:04:10 2017 +0100

    Merge tag 'upstream/2.2.5'
    
    Upstream version 2.2.5
    
    # gpg: Signature made 2017-03-19T21:04:05 CET
    # 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