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

[sramacher at users.alioth.debian.org]

Imported Upstream version 2.2.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a72c887e7895a2f5ed01bad665ec9dadc9b3e554
X-Git-Newrev: 9352002ee7ebeff2bb53b56b0c6a8760ce8e688e

The following commit has been merged in the master branch:
commit b7ac1de93ecf7cd3d86898544433974ce0af7086
Merge: a72c887e7895a2f5ed01bad665ec9dadc9b3e554 5c30428981927be5830a37d739217eb68dfa53de
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Jan 31 21:58:37 2016 +0100

    Merge tag 'upstream/2.2.2'
    
    Upstream version 2.2.2
    
    # gpg: Signature made Sun 31 Jan 2016 21:57:53 CET 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