[SCM] mplayer2/master: Merge tag 'upstream/2.0-726-g6c87a98'

[alessio at users.alioth.debian.org]

Imported Upstream version 2.0-726-g6c87a98
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 02ede0319d3728972a68dfebf5d9e2708125ba7f
X-Git-Newrev: 25cac2c47fa89462d7d2deb13312caf0bc6206bf

The following commit has been merged in the master branch:
commit 383568c4daa786f1dc1503be50b0ea5fe732952f
Merge: 3808e623492bd41b22419e0cf79ea8b8ed5cb0d5 9fba569ad2d15c9606d44865991551803fa23d4e
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Aug 20 22:21:00 2013 +0100

    Merge tag 'upstream/2.0-726-g6c87a98'
    
    Upstream version 2.0-726-g6c87a98
    
    Conflicts:
    	.gitignore


-- 
mplayer2 packaging