[SCM] mpv/master: Merge tag 'upstream/0.2.1'

[ghedo at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 8d1b661fe073f219d17c3a10dac04d8b21d79630
Merge: 394a71cdb71d50105451ab44b2c37c1a07b77bfd 107960d31372c6322600cbb30232c7a17a3da8b4
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Sun Oct 20 16:46:49 2013 +0200

    Merge tag 'upstream/0.2.1'
    
    Upstream version 0.2.1


-- 
mpv packaging