[SCM] jack-mixer/master: Merge tag 'upstream/10'

[alessio at users.alioth.debian.org]

Imported Upstream version 10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: bab17b9001f7554457d9ec9b3381f1582ee170f2
X-Git-Newrev: 663dab6acd599f7456f78ef838c7fc617fa23fe9

The following commit has been merged in the master branch:
commit 663dab6acd599f7456f78ef838c7fc617fa23fe9
Merge: bab17b9001f7554457d9ec9b3381f1582ee170f2 0e49abad114eff4bf7b13f921ff40194f4f5560a
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun May 4 00:53:24 2014 +0100

    Merge tag 'upstream/10'
    
    Upstream version 10


-- 
jack-mixer packaging