[SCM] crtmpserver/master: Merge tag 'upstream/1.0_dfsg'

[jet-guest at users.alioth.debian.org]

Imported Upstream version 1.0~dfsg
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 018015b9c8ec27b554bb7e55a93992176454feb3
X-Git-Newrev: 5fda485a515be5c8a1e9744a430435e25b52dfed

The following commit has been merged in the master branch:
commit 37c212e4a31b81177e99bcd9694acab939067429
Merge: 018015b9c8ec27b554bb7e55a93992176454feb3 a9a61db8084066e3d92179004e0f0d28801f8717
Author: Andriy Beregovenko <jet at jet.kiev.ua>
Date:   Sun Mar 18 11:43:57 2012 +0200

    Merge tag 'upstream/1.0_dfsg'
    
    Upstream version 1.0~dfsg


-- 
crtmpserver packaging