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

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

Imported Upstream version 2.4.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 683513587ba47cfacba3647b363e918664c1ac1f
X-Git-Newrev: c33495a422bc589d285e9a2f3a56af3ec6106ca0

The following commit has been merged in the master branch:
commit 88012cce68bfbba4fadc5c2d6c361a05fe8da85c
Merge: 68ea0324e4b96be241b4569eefe0eba6547d0b44 246f43db3568c65c0ab37a42d03f787273d28606
Author: Unit 193 <unit193 at ubuntu.com>
Date:   Mon Apr 27 17:21:16 2015 -0400

    Merge tag 'upstream/2.4.2'
    
    Upstream version 2.4.2
    
    # gpg: Signature made Mon 27 Apr 2015 05:21:16 PM EDT using RSA key ID EBE9BD91
    # gpg: Good signature from "Unit 193 <unit193 at gmail.com>"
    # gpg:                 aka "Unit 193 <unit193 at ninthfloor.org>"
    # gpg:                 aka "Unit 193 <unit193 at ubuntu.com>"
    # gpg:                 aka "Unit 193 <unit193 at ninthfloor.com>"


-- 
icecast2 packaging