[SCM] jackd2/master: Merge tag 'upstream/1.9.10+20150825git1ed50c92_dfsg'

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

Imported Upstream version 1.9.10+20150825git1ed50c92~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: 31adc6e68d0277f5a8c591cca1c20f26491af5ff
X-Git-Newrev: f63163cdb88065c74eb365e10e7e8922c5764c67

The following commit has been merged in the master branch:
commit c3510c2e37a20b4c4242b6df2ec2b59eb8ea441f
Merge: 667498d4737cd1fc2258a542a9e5cabe475b3811 54f79a9f3655ebd587c357d7048bad4110b95365
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Tue Aug 25 16:01:44 2015 +0200

    Merge tag 'upstream/1.9.10+20150825git1ed50c92_dfsg'
    
    Upstream version 1.9.10+20150825git1ed50c92~dfsg
    
    # gpg: Signature made Tue 25 Aug 2015 04:01:40 PM CEST using RSA key ID 2F52107F
    # gpg: Good signature from "Adrian Knoth <adi at drcomp.erfurt.thur.de>"

diff --combined .gitignore
index 1f033a0,ed06009..435b034
--- a/.gitignore
+++ b/.gitignore
@@@ -1,8 -1,7 +1,8 @@@
 +/.pc
  build/
  man/*.1
- .waf*
  .lock*
+ __pycache__
  android/.server/
  android/.client/
  codeBlocks

-- 
jackd2 packaging