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

[sramacher at users.alioth.debian.org]

Imported Upstream version 2.22
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 7461e3e73ad4dc3b47885b5b3a238518458dcb01
X-Git-Newrev: 0f66773a3c7e64bf359de783cfed80cbd1489876

The following commit has been merged in the master branch:
commit b07693cb934b2ec7c09571d5a951827932daf9f9
Merge: 7461e3e73ad4dc3b47885b5b3a238518458dcb01 082c127b6ab1b513ae6ff63d68838cb44c6f508e
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue Oct 13 17:45:09 2015 +0200

    Merge tag 'upstream/2.22'
    
    Upstream version 2.22
    
    # gpg: Signature made Tue 13 Oct 2015 17:45:05 CEST using RSA key ID 6EA71993
    # gpg: please do a --check-trustdb
    # gpg: Good signature from "Sebastian Ramacher <sebastian at ramacher.at>"
    # gpg:                 aka "Sebastian Ramacher <s.ramacher at gmail.com>"
    # gpg:                 aka "Sebastian Ramacher <s.ramacher at gmx.at>"
    # gpg:                 aka "Sebastian Ramacher <s.ramacher at student.tugraz.at>"
    # gpg:                 aka "Sebastian Ramacher <sramacher at debian.org>"
    # gpg:                 aka "Sebastian Ramacher <sebastian.ramacher at iaik.tugraz.at>"


-- 
ffms2 packaging