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

[bdrung at users.alioth.debian.org]

Imported Upstream version 2.0.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: 4af1b79d6e2d491b71cc4ff092eb813f66668a0b
X-Git-Newrev: 4d4c39c931f8e9116af305b2e4cb1df4653ea970

The following commit has been merged in the master branch:
commit 0bd3ada068c71e655f4e1dd36dfd61d989dff490
Merge: 4af1b79d6e2d491b71cc4ff092eb813f66668a0b 8b47b6d911394e05ea29253d9dfc19217d245df3
Author: Benjamin Drung <bdrung at debian.org>
Date:   Thu Dec 13 10:33:45 2012 +0100

    Merge tag 'upstream/2.0.5'
    
    Upstream version 2.0.5


-- 
VLC media player packaging