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

[bdrung at users.alioth.debian.org]

Imported Upstream version 2.1.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 113292b2d0d9ce4d49853f5bb712d17bf6d8c35f
X-Git-Newrev: 1a30138351ef1c8369ff5e24ac44a657cfcc505e

The following commit has been merged in the master branch:
commit 1a30138351ef1c8369ff5e24ac44a657cfcc505e
Merge: 733a2e891e2a56095643e4127617172fbe6f9753 43f7757c1f109f363b0da0293707c601ce7b4d1d
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sat Feb 15 16:27:05 2014 +0100

    Merge tag 'upstream/2.1.3'
    
    Upstream version 2.1.3


-- 
VLC media player packaging