[SCM] mplayer/master: Merge branch 'master' of git://git.debian.org/git/pkg-multimedia/mplayer

[siretart at users.alioth.debian.org]

Update documentation with regard to our modifications to the upstream tarball.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b8f6a0ae174f1bc2157fbedb6848d4a9e11d5259
X-Git-Newrev: f6ff54869b717d8c931fe43a1fa5fb5d905b514b

The following commit has been merged in the master branch:
commit 637bfb0fcfc540d753c58dd0143186de6dfa6464
Merge: ed476923ccb6012631f38f0e0b6a3e032b77a264 b8f6a0ae174f1bc2157fbedb6848d4a9e11d5259
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Feb 13 09:41:08 2011 +0100

    Merge branch 'master' of git://git.debian.org/git/pkg-multimedia/mplayer


-- 
mplayer packaging