[SCM] jack-stdio/master: Merge commit 'upstream/1.4'

[alessio at users.alioth.debian.org]

Imported Upstream version 1.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6fab874071f0a41b40d3a35f5fc7416fa9f19d93
X-Git-Newrev: 2016a5dedf0ed6e626b68e9e08a95666ceeabd06

The following commit has been merged in the master branch:
commit 2927bf3d4fad55f0df65a5e76cba0a541c13c81e
Merge: 6fab874071f0a41b40d3a35f5fc7416fa9f19d93 527707e2c666acbda4bd4649af64400e44204fb0
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Jun 8 10:15:01 2011 +0200

    Merge commit 'upstream/1.4'
    
    Solved conflicts:
    	debian/changelog


-- 
jack-stdio packaging