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

[sramacher at users.alioth.debian.org]

New upstream version 2.2.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b5ff1ffad9d33b197cbe2ed02cafa5e6c49ace3c
X-Git-Newrev: 03c35b8636d340f6696a5508f9c5fe668bdecd96

The following commit has been merged in the master branch:
commit 4ca24082cafd13aa6fe639b083ad43b188da33ee
Merge: b5ff1ffad9d33b197cbe2ed02cafa5e6c49ace3c b0580e8c29f644798f54cad770276bd7edcb59ee
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed May 24 17:35:07 2017 +0200

    Merge tag 'upstream/2.2.6'
    
    Upstream version 2.2.6
    
    # gpg: Signature made 2017-05-24T17:35:03 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