[SCM] jackd2/master: Merge tag 'upstream/1.9.9.5_dfsg'

[js at users.alioth.debian.org]

Imported Upstream version 1.9.9.5~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: 3a39d2bd6a5f28acef68e5c14c4763d52fc7d1c6
X-Git-Newrev: acf8a7b0b2e343712d654aa3959213dd52dc9a92

The following commit has been merged in the master branch:
commit 54d621fdc8e5153721d882df1888a6ee5e82ea6b
Merge: 079b372417f2b679b87b9f7d88f5bc4afbfe3ded 2e308773bdf366401b0c9881e13559802b58fee9
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Dec 21 03:45:30 2012 +0100

    Merge tag 'upstream/1.9.9.5_dfsg'
    
    Upstream version 1.9.9.5~dfsg
    
    Conflicts:
    	.gitignore

diff --combined .gitignore
index b408e6c,90db7d7..642a459
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,4 +1,5 @@@
 +/.pc
+ build/
+ man/*.1
+ .waf*
+ .lock*

-- 
jackd2 packaging