[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: 6ac08d7d3b7e4426c270223e100660d479035b83
X-Git-Newrev: 798cf1461b829986c36f7174b3c8021bac2e7823

The following commit has been merged in the master branch:
commit ffabadbb122bd26e741a7d5023ed97651384a46c
Merge: a69316ef6203f59baf7d943600c85a7bb1952035 1f6a3b3e2866bcbe4c438fb5f4fe09a7e75488cf
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Jun 18 17:00:48 2017 +0200

    Merge tag 'upstream/2.2.6'
    
    Upstream version 2.2.6
    
    # gpg: Signature made 2017-06-18T17:00:44 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