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

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

Imported Upstream version 2.0.0~dfsg
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 1fce33efb2c40290b563cdf92d2bfa3d3e3e182f
X-Git-Newrev: 78b232f97e13241be02365bb8bc9f56e610efc50

The following commit has been merged in the master branch:
commit 6a788f452e9a818279a22bb18b9d345597c32440
Merge: 1fce33efb2c40290b563cdf92d2bfa3d3e3e182f db944f0b9ec6e016dc7d1bddc960e699063ae56b
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Sun Jan 24 22:16:00 2016 +0100

    Merge branch 'upstream'


-- 
mixxx packaging