[SCM] crtmpserver/master: Merge tag 'upstream/1.1_rc1_dfsg'

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

Imported Upstream version 1.1~rc1~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: aa66cd1cb8a0ef0925aef79206ada92d1020340e
X-Git-Newrev: c54892cffdc9f013e432b0ecad80c96795538bce

The following commit has been merged in the master branch:
commit 2e131049aca07cf23d2f070fe6c57741d6b38ff7
Merge: aa66cd1cb8a0ef0925aef79206ada92d1020340e 9c335cb424c2d2446c7a234fd87736950f320b18
Author: Andriy Beregovenko <jet at jet.kiev.ua>
Date:   Sat Jun 1 20:09:09 2013 +0300

    Merge tag 'upstream/1.1_rc1_dfsg'
    
    Upstream version 1.1~rc1~dfsg


-- 
crtmpserver packaging