[SCM] vlc/jessie: Merge tag 'upstream/2.2.5' into jessie

[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/jessie
X-Git-Reftype: branch
X-Git-Oldrev: a741760015316100a67a93f37a8d35ac53a87312
X-Git-Newrev: a2ae3907bb3e051e8264d003312d2a4173aeb697

The following commit has been merged in the jessie branch:
commit 5886c7436fd78863df153ffdab6c403c26fc7a9e
Merge: a741760015316100a67a93f37a8d35ac53a87312 245be92b33b7be733f4007c7323033dd4c27bec7
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Fri Apr 7 19:18:25 2017 +0200

    Merge tag 'upstream/2.2.5' into jessie
    
    Upstream version 2.2.5


-- 
VLC media player packaging