[SCM] vlc/master: Merge tag 'upstream/2.2.0-pre2'

[siretart at users.alioth.debian.org]

Imported Upstream version 2.2.0-pre2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a91183972203f5328dea90f5b3280fb6dd5bad34
X-Git-Newrev: 39bb2452c557ff14dc6e34d330cefd29c65c5e93

The following commit has been merged in the master branch:
commit 876632c9a66fda0ab989d449f276da65b077ab63
Merge: a91183972203f5328dea90f5b3280fb6dd5bad34 2349daf1bdde655b0ad8c489ff89c742543b6253
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Aug 17 21:50:23 2014 -0400

    Merge tag 'upstream/2.2.0-pre2'
    
    Upstream version 2.2.0-pre2


-- 
VLC media player packaging