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

[ghedo at users.alioth.debian.org]

Imported Upstream version 0.3.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: d2ca15fca9b313df6ca45c9ceef3720c9c400e90
X-Git-Newrev: 86f0f951c0bc187f78b70620e7f8b0710fdd076d

The following commit has been merged in the master branch:
commit d8d1408785fbe5cf5dc77612f68113413ce7d942
Merge: d2ca15fca9b313df6ca45c9ceef3720c9c400e90 cffa080d46788c9e5192ed9fcc1b311128161735
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Tue Mar 11 11:43:00 2014 +0100

    Merge tag 'upstream/0.3.6'
    
    Upstream version 0.3.6


-- 
mpv packaging