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

[ghedo at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit d52c5c8b80d3286083b99e7e513f2f3961834bfc
Merge: a3c1a95a9a9c7189e7460ef1a516d6fef2379d27 59693ccb7c27baebfacdcfe13927f30f70d8e317
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Tue Sep 30 21:06:59 2014 +0200

    Merge tag 'upstream/0.6.0'
    
    Upstream version 0.6.0


-- 
mpv packaging