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

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

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

The following commit has been merged in the master branch:
commit fd2e2e325aff02781ceec805f7b6fb857ab39b44
Merge: 8cdd9dd91a86ec9146ede617bc4c846a98e5466f c423357c93592bfb48ee7edbfba8936f20987cf7
Author: Jackson Doak <jackson at jackson-Vostro-1320>
Date:   Sat Nov 30 07:58:26 2013 +1100

    Merge tag 'upstream/3.4.2'
    
    Upstream version 3.4.2


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