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

[ghedo at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit cb1e41c143d5eb9f28e8894b4fa8372c626219e9
Merge: 479b3e292c54c5a91e0aa7e73ef2b452b18d66d8 8f15af2f5dd9177238ef666f7cb020f753ae74db
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Sat Nov 2 23:09:22 2013 +0100

    Merge tag 'upstream/0.2.2'
    
    Upstream version 0.2.2


-- 
mpv packaging