[SCM] libshout/master: Merge tag 'upstream/2.3.1'

[js at users.alioth.debian.org]

Imported Upstream version 2.3.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: 683b7d851b64c0d25ab718b7426da4ef08dad296
X-Git-Newrev: 288a3f4b2b304886ad4e6f996f2396fa44b96b08

The following commit has been merged in the master branch:
commit fd5fc4d4f9580b7f0f31e780d6b3d7c0693807d5
Merge: 683b7d851b64c0d25ab718b7426da4ef08dad296 39b74704f6761cb1afde272492be16953088e379
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Jun 5 16:33:46 2012 +0200

    Merge tag 'upstream/2.3.1'
    
    Upstream version 2.3.1
    # gpg: Signature made tir 05 jun 2012 16:33:45 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]"


-- 
libshout packaging