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

[mati75-guest at users.alioth.debian.org]

New upstream version 2.2.5.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 5e3fd59353463d8645dcf48560742d416162a3bd
X-Git-Newrev: aa80be306c136b9624878844e3addeed76e78e65

The following commit has been merged in the master branch:
commit e89dcc1ca791daecd133d3418b772c4973d3ef7e
Merge: 5e3fd59353463d8645dcf48560742d416162a3bd 181f2a952dfdd1ddf189096ffe678ef5fe22e9ba
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Mon May 8 20:00:34 2017 +0200

    Merge tag 'upstream/2.2.5.1'
    
    Upstream version 2.2.5.1


-- 
VLC media player packaging