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

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

Imported Upstream version 1.2.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6ea3b79d2fb3e81d8e7dbf46005dfb039fe9b9d1
X-Git-Newrev: 23b6147a2190647fa724843801b46fe99d1a081e

The following commit has been merged in the master branch:
commit 772d4eb4663bdf216e5b5064df80b198db18c41c
Merge: 6ea3b79d2fb3e81d8e7dbf46005dfb039fe9b9d1 daafe304467f884c1b655c89237e3d9b21382a08
Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
Date:   Tue Feb 23 19:56:43 2016 -0500

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1
    
    # gpg: Signature made Tue 23 Feb 2016 07:56:43 PM EST using RSA key ID 3FF1F693
    # gpg: Good signature from "Miguel A. Colón Vélez <debian.micove at gmail.com>"


-- 
mplayer packaging