[SCM] mplayer/master.experimental: Merge tag 'upstream/1.1.1+svn37329' into master.experimental

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

Imported Upstream version 1.1.1+svn37329
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master.experimental
X-Git-Reftype: branch
X-Git-Oldrev: 92e6d4353a3a95cdf2bf1d24d9d6bfb331ad672f
X-Git-Newrev: 9c916d83eb9d0707c75d18942224c8680a9d9da2

The following commit has been merged in the master.experimental branch:
commit b620425dbc0df75008ec8f18158b0f73e97ad495
Merge: be9389b205fce2abd7c61e28fd531798a6535104 5ce6058b59e2977680cd0f057e65d01da88d8880
Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
Date:   Mon Dec 1 23:58:07 2014 -0500

    Merge tag 'upstream/1.1.1+svn37329' into master.experimental
    
    Upstream version 1.1.1+svn37329
    
    # gpg: Signature made Mon 01 Dec 2014 11:58:05 PM EST using RSA key ID 3FF1F693
    # gpg: Good signature from "Miguel A. Colón Vélez <debian.micove at gmail.com>"
    
    Conflicts:
    	debian/copyright


-- 
mplayer packaging