[SCM] audacious/master: Merge branch 'upstream'

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

Imported Upstream version 3.7.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: 0c4a59ef13c7c77405307e31919477f040705d2d
X-Git-Newrev: d289937233b7c943227bfbdf0f49e0c81cd7e87f

The following commit has been merged in the master branch:
commit 12f536ef0d0631c41ca0b5345b59691aed473c4b
Merge: 0c4a59ef13c7c77405307e31919477f040705d2d 7f08dcfc78675bed63f962f6d01cfb18264e12c7
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Fri Feb 5 21:36:25 2016 +0100

    Merge branch 'upstream'


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