[SCM] mixxx/master.jessie-bpo: Merge branch 'master' into master.jessie-bpo

[jcowgill at users.alioth.debian.org]

The following commit has been merged in the master.jessie-bpo branch:
commit 3d87a9f7a77454c3c0a5525acef69039ed58abba
Merge: 367eb13463e0e5d53879de1dd8c9f85f51232b7d 16a637addccd3c064ed8dceb6e21d4739b9eb625
Author: James Cowgill <jcowgill at debian.org>
Date:   Mon Nov 28 09:22:52 2016 +0000

    Merge branch 'master' into master.jessie-bpo


-- 
mixxx packaging