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

[ghedo at users.alioth.debian.org]

Imported Upstream version 0.6.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: 381e846ecdd512cfca6aa12f4c19587fb3699b3e
X-Git-Newrev: 40dfff488d1539fbcdd05d80ba681e21632f0f28

The following commit has been merged in the master branch:
commit 147a7526e820ed7cf990631125e19b7c0de81daf
Merge: 9a4d7ea0e6fe776156e9b9da63b0551dc55f8412 edc75b75a387886c5a64f223f4707fc3ec2953c7
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Sun Oct 12 14:32:17 2014 +0200

    Merge tag 'upstream/0.6.1'
    
    Upstream version 0.6.1


-- 
mpv packaging