[SCM] icecast2/master: Merge tag 'upstream/2.3.3'

[js at users.alioth.debian.org]

Imported Upstream version 2.3.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 7754928fdb747ec0e3ad9092abe466b3293862c6
X-Git-Newrev: 3889d6b32195fb58b110c80c8a9466e7a9a40e6d

The following commit has been merged in the master branch:
commit 67d23f17a7ace4dbb7c39ea772c72572af53b74e
Merge: 5ddeb7ed1098c4f90906224d081576eed4015e5b 60fcaa6debcc409731eb0d8e7b9f7b8ea137fc5c
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Jun 13 01:00:50 2012 +0200

    Merge tag 'upstream/2.3.3'
    
    Upstream version 2.3.3
    # gpg: Signature made ons 13 jun 2012 01:00:49 CEST using RSA key ID C1A00121
    # gpg: Good signature from "Jonas Smedegaard <dr at jones.dk>"
    # gpg:                 aka "Jonas Smedegaard <jonas at homebase.dk>"
    # gpg:                 aka "Jonas Smedegaard <js at debian.org>"
    # gpg:                 aka "Jonas Smedegaard <jonas at dgi-huset.dk>"
    # gpg:                 aka "Jonas Smedegaard <jonas at 107b.dk>"
    # gpg:                 aka "[jpeg image of size 4165]"


-- 
icecast2 packaging