[SCM] mplayer/master: Merge tag 'upstream/1.3.0'

[sramacher at users.alioth.debian.org]

Imported Upstream version 1.3.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: 677d73a5aca03763e444325f4fa9dd35ee674e6f
X-Git-Newrev: b3ac88d16ecc9b9c443db891e79472b11e11dccc

The following commit has been merged in the master branch:
commit 6872b792c4308e29f19c24cc828440892d3fe9a5
Merge: 677d73a5aca03763e444325f4fa9dd35ee674e6f 82a5dc9f8e5acce4bca739573fdc800cd5b4fc7b
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Apr 17 21:12:18 2016 +0200

    Merge tag 'upstream/1.3.0'
    
    Upstream version 1.3.0
    
    # gpg: Signature made Sun 17 Apr 2016 21:12:11 CEST using RSA key ID 6EA71993
    # gpg: Good signature from "Sebastian Ramacher <sebastian at ramacher.at>"
    # gpg:                 aka "Sebastian Ramacher <s.ramacher at gmail.com>"
    # gpg:                 aka "Sebastian Ramacher <s.ramacher at gmx.at>"
    # gpg:                 aka "Sebastian Ramacher <s.ramacher at student.tugraz.at>"
    # gpg:                 aka "Sebastian Ramacher <sramacher at debian.org>"
    # gpg:                 aka "Sebastian Ramacher <sebastian.ramacher at iaik.tugraz.at>"


-- 
mplayer packaging