[SCM] vlc/master: Merge commit 'upstream/1.1.13'

[bdrung at users.alioth.debian.org]

Imported Upstream version 1.1.13
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: fff8b76947784fd17ccbab4eef4c7466b357e45a
X-Git-Newrev: db68dbfc275258870a9eaea9b3f673123740004c

The following commit has been merged in the master branch:
commit db68dbfc275258870a9eaea9b3f673123740004c
Merge: edddd79ef88913ee964e9c22e66d6428db18309d 91665bb79116f50233ce94a5fdb858071135d0d0
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sat Dec 31 11:50:41 2011 +0100

    Merge commit 'upstream/1.1.13'


-- 
VLC media player packaging