[SCM] audacious/master: Merge commit 'upstream/3.2'

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

Imported Upstream version 3.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: 1289ad529dffd91e1279493015b3987eecf4163e
X-Git-Newrev: e0df2e850d60999970bbe6e4106ac4d4e80b9d6b

The following commit has been merged in the master branch:
commit e0df2e850d60999970bbe6e4106ac4d4e80b9d6b
Merge: 1289ad529dffd91e1279493015b3987eecf4163e de557c9169bd7b74b5126b8c6192c6251d03407c
Author: Cyril Lavier <cyril.lavier at davromaniak.eu>
Date:   Wed Jan 25 21:52:26 2012 +0100

    Merge commit 'upstream/3.2'


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