[SCM] rtmpdump/master: Merge commit 'upstream/2.4+20111222.git4e06e21'

[siretart at users.alioth.debian.org]

Imported Upstream version 2.4+20111222.git4e06e21
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b338addd0c27031ac889d18f2073cdbad3d20cf3
X-Git-Newrev: ec41f8444eecc3932a9f63ecfb335efec68f2167

The following commit has been merged in the master branch:
commit 0b63bd270716c1b5bda1947b47624520789728e3
Merge: b338addd0c27031ac889d18f2073cdbad3d20cf3 8eb3ee9bca73a6b586da187a4de95a86380b682b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 8 11:58:49 2012 +0100

    Merge commit 'upstream/2.4+20111222.git4e06e21'


-- 
rtmpdump packaging