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

[ghedo at users.alioth.debian.org]

Imported Upstream version 0.12.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: 964db4f07a8e46feafe8fe873aef84debb5ca9fa
X-Git-Newrev: 4f2c8b7dc0547db89c8c9134cb40fea6f80fe5bb

The following commit has been merged in the master branch:
commit 700f5a16076e43c3e21efa593e6e925a2e9c9f24
Merge: 964db4f07a8e46feafe8fe873aef84debb5ca9fa d52321e2ca1f7d3a427a0737e9b2204887eab81f
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Thu Oct 29 11:11:33 2015 +0100

    Merge tag 'upstream/0.12.0'
    
    Upstream version 0.12.0


-- 
mpv packaging