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

[sramacher at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 3ca76147d25d3a312735e1308c34669309253843
Merge: 7a394d6f2b2fea85b8ab7ccae0cfe49f23e8a21a d68e02ae5dd5656c1a9da8f5f6ceb0d70e78eca2
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue Jul 1 01:39:02 2014 +0200

    Merge tag 'upstream/2.20'
    
    Upstream version 2.20


-- 
ffms2 packaging