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

[ghedo at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 120068a1061439469ace5c68d723d9f8d7437c8d
Merge: f5fcd66d5763bd92b1c22c9715e38fabcfd469d9 f2aa3aa6874043ba92adcebb603069d60b0547e9
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Sat Sep 14 15:23:21 2013 +0200

    Merge tag 'upstream/0.1.6'
    
    Upstream version 0.1.6


-- 
mpv packaging