[SCM] rtmpdump/master: fixed merge from upstream branch

[siretart at users.alioth.debian.org]

Really revert to version 79459a2b43f41ac44a2ec001139bcb7b1b8f7497
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: ac23f0576a03fbe65877c51b9e8ac9603f4d2a1d
X-Git-Newrev: a36b3fa0b2f996a9d76b3e69b22127c5960ce064

The following commit has been merged in the master branch:
commit 6602bbbf10954511b1869a5d7486051917ff3d49
Merge: ac23f0576a03fbe65877c51b9e8ac9603f4d2a1d 977f314a8e1899547c341b991d1fb0ffa62b3e2b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Apr 7 20:57:16 2014 -0400

    fixed merge from upstream branch


-- 
rtmpdump packaging