[SCM] rtmpdump/master: Merge commit 'upstream/2.4_20110711.gitc28f1bab'

[alessio at users.alioth.debian.org]

Imported Upstream version 2.4~20110711.gitc28f1bab
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2c376faacb53d4563f36e1c9e0e95798394d8f3e
X-Git-Newrev: 68f0bd504c40823d380d3b81fc70c3aa2753b5bd

The following commit has been merged in the master branch:
commit 68f0bd504c40823d380d3b81fc70c3aa2753b5bd
Merge: 2c376faacb53d4563f36e1c9e0e95798394d8f3e 3b122c1505408da4a956eea798493e594f83b249
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Aug 16 13:45:32 2011 +0200

    Merge commit 'upstream/2.4_20110711.gitc28f1bab'


-- 
rtmpdump packaging