[SCM] mplayer2/upstream: Merge tag 'upstream/2.0-518-gb711624' into upstream

[alessio at users.alioth.debian.org]

Imported Upstream version 2.0-518-gb711624
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/upstream
X-Git-Reftype: branch
X-Git-Oldrev: 9faf7a2505e9ee7d7a8790f2aff5a543693b045d
X-Git-Newrev: a64a8adb11e65d7c8437b79dc9be653b9d203715

The following commit has been merged in the upstream branch:
commit a64a8adb11e65d7c8437b79dc9be653b9d203715
Merge: 9faf7a2505e9ee7d7a8790f2aff5a543693b045d 0a487f61e08ec134dafab0c97de9cca5c8164a2a
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue May 1 03:30:24 2012 +0200

    Merge tag 'upstream/2.0-518-gb711624' into upstream
    
    Upstream version 2.0-518-gb711624


-- 
mplayer2 packaging