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

[ghedo at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 26be90b41eefde11c4ea9a7f5e2b2a37f0a788a4
Merge: ef9e22de815465a7a29cef52d922c3041296af30 6024bfed8d01d459688742098a0e99131fc2bda6
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Sat Sep 7 11:27:09 2013 +0200

    Merge tag 'upstream/0.1.5'
    
    Upstream version 0.1.5


-- 
mpv packaging