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

[ghedo at users.alioth.debian.org]

Imported Upstream version 0.4.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: c9bbc2d3d8257215ce2bdfddc5b7149ad63a363e
X-Git-Newrev: 636dc7b2fea808af4ed6b1e25a8ab6460e32584b

The following commit has been merged in the master branch:
commit 561991cd55e01c45b52e1e804b40093d7d589ca2
Merge: c9bbc2d3d8257215ce2bdfddc5b7149ad63a363e a1af603a3309eea7728e11ce446a69b45c5a65c6
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Wed Jun 25 20:57:08 2014 +0200

    Merge tag 'upstream/0.4.0'
    
    Upstream version 0.4.0


-- 
mpv packaging