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

[jcowgill at users.alioth.debian.org]

New upstream version 0.25.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: d37a46aef3242d33e30b106245da6fdd4f529ea8
X-Git-Newrev: b0e6538bea6e48c010a310141b88b83bcc334ac6

The following commit has been merged in the master branch:
commit 071e2a8871f32a9f1b8a5c5b04135ea02aa9f277
Merge: d37a46aef3242d33e30b106245da6fdd4f529ea8 4960f31a0d030784e60243679f1a51332b44499f
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Sun Apr 23 16:56:55 2017 +0100

    Merge tag 'upstream/0.25.0'
    
    Upstream version 0.25.0
    
    # gpg: Signature made Sun 23 Apr 2017 16:56:51 BST
    # gpg:                using RSA key F88C6DE43699E8F3B3B54C10C7F1676DEA2D01EF
    # gpg:                issuer "james410 at cowgill.org.uk"
    # gpg: Good signature from "James Cowgill <james410 at cowgill.org.uk>" [ultimate]
    # gpg:                 aka "James Cowgill (Imagination Technologies) <James.Cowgill at imgtec.com>" [ultimate]
    # gpg:                 aka "James Cowgill <jcowgill at debian.org>" [ultimate]


-- 
mpv packaging