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

[micove-guest at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 57d368915010d0103f3e2a86de42c875c7ec9db5
Merge: 6a14a4bfb75f232a359b241ed43a8a8df4afe955 482eb46f79d2958a8234b9dccb5acea5e508dfec
Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
Date:   Mon Oct 19 02:20:09 2015 -0400

    Merge tag 'upstream/1.2'
    
    Upstream version 1.2
    
    # gpg: Signature made Mon 19 Oct 2015 02:20:09 AM EDT using RSA key ID 3FF1F693
    # gpg: Good signature from "Miguel A. Colón Vélez <debian.micove at gmail.com>"


-- 
mplayer packaging