[SCM] crtmpserver/master: Merge commit 'upstream/0.0_dfsg+svn611.1'

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

Imported Upstream version 0.0~dfsg+svn611.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c0ce51e993b0d10e2b03ac2cc7077b77aec733c1
X-Git-Newrev: 1ba6610128bcf372e3295496d9f933470a3bed89

The following commit has been merged in the master branch:
commit d308e096a8a0f19e16c631b77115d39fbfd72469
Merge: 41baef3a13f4a6b05f1f6dd983b045ace6904be2 fbe8e790dea117160f70247c638b33178776f666
Author: Andriy Beregovenko <jet at jet.kiev.ua>
Date:   Fri Nov 11 17:49:19 2011 +0200

    Merge commit 'upstream/0.0_dfsg+svn611.1'


-- 
crtmpserver packaging