[SCM] audacious/master: Merge tag 'upstream/3.3.1'

[alessio at users.alioth.debian.org]

Imported Upstream version 3.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: a662192edc8aa541fd8ca29a489bf6d3f1b1ff90
X-Git-Newrev: 8e920b11fa7fbc9fa04a9fc527b106f38ab63821

The following commit has been merged in the master branch:
commit 8e920b11fa7fbc9fa04a9fc527b106f38ab63821
Merge: a662192edc8aa541fd8ca29a489bf6d3f1b1ff90 3c46cd7449c32f71b7b3246b4f32aace3d9e3f84
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Sep 6 17:33:01 2012 +0200

    Merge tag 'upstream/3.3.1'
    
    Upstream version 3.3.1


-- 
Small and fast audio player which supports lots of formats