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

[ghedo at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 743e45c361aab0c8bcde5403ba6351848a8a652d
Merge: afd6e7213615672ed0810463a9386e955f061ecd 966ace5bf2f9115cd660cfc95daf9a68140b8580
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Tue Sep 23 21:26:26 2014 +0200

    Merge tag 'upstream/0.5.4'
    
    Upstream version 0.5.4


-- 
mpv packaging