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

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

Imported Upstream version 2.4.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 1a3750f3e6f2548ddce3d9ecb060eb38f6c8bf1a
X-Git-Newrev: 909cf51e5d541f9926118276a4acb283e2393274

The following commit has been merged in the master branch:
commit d83ad5b4f4375b01ae31c66242746c0820e81e29
Merge: 1a3750f3e6f2548ddce3d9ecb060eb38f6c8bf1a 1ecfc7ae9a3c43d0444e5d1f5ac86acdeb56b417
Author: Unit 193 <unit193 at ubuntu.com>
Date:   Thu May 15 20:05:24 2014 -0400

    Merge tag 'upstream/2.4.0'
    
    Upstream version 2.4.0
    
    # gpg: Signature made Thu 15 May 2014 08:05:24 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>"


-- 
icecast2 packaging