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

[bdrung at users.alioth.debian.org]

Imported Upstream version 2.0.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4fdf67b3998845559160e27cb493fa336896b1f7
X-Git-Newrev: 34b682b0b9e9a97d3b42a1ca1e59487a31166e23

The following commit has been merged in the master branch:
commit 7ce6be710dc3574eea08b2db6ffdf018decb5fa6
Merge: 410fe38f1f9e193fa171d8d90f7215e063e3a711 087169e0a4134188ed6c4055bd76910e4ab51ef9
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Jun 4 00:17:14 2013 +0200

    Merge tag 'upstream/2.0.7'
    
    Upstream version 2.0.7


-- 
VLC media player packaging