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

[bdrung at users.alioth.debian.org]

Imported Upstream version 1.1.12
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 501d69403cfae6125a310777951e50210eda1abc
X-Git-Newrev: 80eebcef150ac092fa252892e42ebe51a4ea6762

The following commit has been merged in the master branch:
commit 520eadb93ba8dc82cf018b892721c4081a99affd
Merge: d9844ca28307b32108c50e3d0fe50ea450456d7f 2f7bd4c8391379cf3bd1e4d8c93dfa7168320253
Author: Benjamin Drung <bdrung at debian.org>
Date:   Thu Oct 6 23:19:04 2011 +0200

    Merge commit 'upstream/1.1.12'


-- 
VLC media player packaging