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

[edwardw-guest at users.alioth.debian.org]

Imported Upstream version 2.1.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 896ac073027db804f5ad421d3efb53fbd9c5eef5
X-Git-Newrev: 794b88b2aefd1e8c3b1b90b34bf443721fc70d9b

The following commit has been merged in the master branch:
commit 8cdf37e328861250dea43b1a8dca112afcdf097c
Merge: 896ac073027db804f5ad421d3efb53fbd9c5eef5 b9da57fd8c8c9789ff8a64755f04c7adfdf91480
Author: Edward Wang <edward.c.wang at compdigitec.com>
Date:   Sun Oct 6 10:49:07 2013 -0400

    Merge tag 'upstream/2.1.0'
    
    Upstream version 2.1.0


-- 
VLC media player packaging