[SCM] npapi-vlc/master: Merge tag 'upstream/2.0.6'

[bdrung at users.alioth.debian.org]

Imported Upstream version 2.0.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 951ca3aa1f8de7e9b70ba015e7cceaaf7699c05d
X-Git-Newrev: 75c63662432e07144fe1c590136390c39d814c4b

The following commit has been merged in the master branch:
commit e7f9530d7a4450dead0b28715fef84e0b8302877
Merge: 41ea40417c9e036cb73e8d2f6bb6f33cef0aab22 5d221bcb27fb9dcefe9de972b6b7a78d83f3c682
Author: Benjamin Drung <bdrung at debian.org>
Date:   Mon Jun 24 23:38:11 2013 +0200

    Merge tag 'upstream/2.0.6'
    
    Upstream version 2.0.6


-- 
npapi-vlc packaging