[SCM] ffms2/master: Merge tag 'upstream/2.21'

[sramacher at users.alioth.debian.org]

Imported Upstream version 2.21
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 42d3843e5a1c57a9cc87eef853bd751ee893fe02
X-Git-Newrev: 0c73bd801c309447249f7e5ea2d7b1b1999542a9

The following commit has been merged in the master branch:
commit 8026674e0689693243f9c5936bd67d3df97195ae
Merge: 42d3843e5a1c57a9cc87eef853bd751ee893fe02 03a456dab9157020fb4ca44fc9ed758fa6d4e4ec
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon May 18 15:44:41 2015 +0200

    Merge tag 'upstream/2.21'
    
    Upstream version 2.21


-- 
ffms2 packaging