[SCM] jackd2/upstream: Merge branch 'upstream' into HEAD

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

Imported Upstream version 1.9.9.5+20130127git15950eb1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/upstream
X-Git-Reftype: branch
X-Git-Oldrev: db57f2f960d59a62423e1e07d9dfc0f2764a1336
X-Git-Newrev: d43718d185e4e922509d70d8b762521c0969d575

The following commit has been merged in the upstream branch:
commit d43718d185e4e922509d70d8b762521c0969d575
Merge: f230da9aca72c3db1dd22bee15bf06bd281c1429 ff482c725d427bb1f00ea7f02d8b2a11da889780
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Sun Jan 27 21:17:50 2013 +0100

    Merge branch 'upstream' into HEAD
    
    Conflicts:
    	ChangeLog
    	common/JackConstants.h
    	wscript


-- 
jackd2 packaging