[SCM] rtmpdump/master: Merge tag 'upstream/2.4+20151223.gitfa8646d.1'

[sramacher at users.alioth.debian.org]

Imported Upstream version 2.4+20151223.gitfa8646d.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0fe3697129b5c3a6240503ed69e63f94d8f9dc89
X-Git-Newrev: a5d33b973d8cae8543ee8b7770d26aa7b24e1516

The following commit has been merged in the master branch:
commit 9f59a200aaf62b6d4052c79c4471596a8c3d40b1
Merge: 0fe3697129b5c3a6240503ed69e63f94d8f9dc89 040b2c228093dbb9657810182aac5c34fc49f4c6
Author: Sebastian Ramacher <sebastian at ramacher.at>
Date:   Wed Apr 27 11:22:31 2016 +0200

    Merge tag 'upstream/2.4+20151223.gitfa8646d.1'
    
    Upstream version 2.4+20151223.gitfa8646d.1


-- 
rtmpdump packaging