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

[bdrung at users.alioth.debian.org]

Imported Upstream version 2.1.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 37b95f4d6093ac966e3f7529651f8f8a409b65ae
X-Git-Newrev: 87a4cb0902c16778c95a74c6fcf0fd62c32741da

The following commit has been merged in the master branch:
commit 40ef0d7ec8e6fa571d8d514de034cf0131bcdde2
Merge: 37b95f4d6093ac966e3f7529651f8f8a409b65ae b051a53536e11bc8cfd10d7cad7f76cced962b37
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Jul 29 20:11:48 2014 +0200

    Merge tag 'upstream/2.1.5'
    
    Upstream version 2.1.5


-- 
VLC media player packaging