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

[sramacher at users.alioth.debian.org]

Imported Upstream version 2.19
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 9a532264aadadd6a76ce332da16c3eb7dc6b2cb2
X-Git-Newrev: de13a31e0665c6807185a5c4b7efb842910b27e7

The following commit has been merged in the master branch:
commit 27602586c0dc2ba79df802956f2ee361c8b13e19
Merge: 9a532264aadadd6a76ce332da16c3eb7dc6b2cb2 9ed6d512896024a42ae50b19f41501f867347ceb
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Dec 2 20:10:45 2013 +0100

    Merge tag 'upstream/2.19'
    
    Upstream version 2.19
    
    Conflicts:
    	.gitignore
    	Makefile.in
    	aclocal.m4
    	config.guess
    	config.sub
    	configure
    	depcomp
    	missing


-- 
ffms2 packaging