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

[ghedo at users.alioth.debian.org]

Imported Upstream version 0.1.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e074336fe9e5aaaf2d9b6439bcf7cd9c2e07ab1f
X-Git-Newrev: 980c4957b1628a5e451336c98090bdb05a6be67e

The following commit has been merged in the master branch:
commit 6b2a33b04173ce0ceb016c89d491d1cf156068ec
Merge: e074336fe9e5aaaf2d9b6439bcf7cd9c2e07ab1f 51212ab434fae035c944516674caf8b399ed4747
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Fri Sep 20 23:28:53 2013 +0200

    Merge tag 'upstream/0.1.7'
    
    Upstream version 0.1.7


-- 
mpv packaging