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

[bdrung at users.alioth.debian.org]

Imported Upstream version 2.0.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4e9c9369d59ed5391f83bce44323cf76b3030456
X-Git-Newrev: 4829618c8635abc84942bc4ce4e5dafc469b840d

The following commit has been merged in the master branch:
commit 762e471a69bd994742cac89cbc13885c7d01def6
Merge: 4e9c9369d59ed5391f83bce44323cf76b3030456 a79e2caa553f97bc6357884d7f17d86b03492b29
Author: Benjamin Drung <bdrung at debian.org>
Date:   Mon Oct 15 22:26:20 2012 +0200

    Merge tag 'upstream/2.0.4'
    
    Upstream version 2.0.4


-- 
VLC media player packaging