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

[jcowgill at users.alioth.debian.org]

Imported Upstream version 0.18.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: 547b365b060a62806f5f888a5ee071ea1ed1895e
X-Git-Newrev: d17986919c6da4e1de20660603e7913dea2e88bc

The following commit has been merged in the master branch:
commit 8eb77fc1e34d14a5931c3466e4b694e48cd77522
Merge: 547b365b060a62806f5f888a5ee071ea1ed1895e b3df5144ae0631b8634e535ba90245e8cdfd2a0a
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Mon Jul 4 11:19:18 2016 +0200

    Merge tag 'upstream/0.18.0'
    
    Upstream version 0.18.0
    
    # gpg: Signature made Mon 04 Jul 2016 11:19:13 SAST
    # gpg:                using RSA key C7F1676DEA2D01EF
    # gpg: Good signature from "James Cowgill <james410 at cowgill.org.uk>" [ultimate]
    # gpg:                 aka "James Cowgill <jc1311 at york.ac.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