[SCM] obs-studio/master: Merge branch 'master' of ssh://git.debian.org/git/pkg-multimedia/obs-studio

[sramacher at users.alioth.debian.org]

Allow libjack-jackd2-dev as build alternative for libjack-dev.
Adjust git-buildpackage setup.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4fd43f1c03bf3e3543fdfbd8d20371f1b6c3b4ac
X-Git-Newrev: 04bd1f0b24de9e1b20508336970144e284a70211

The following commit has been merged in the master branch:
commit e5ae9e9791f2b3a4fa10e700b471e5992e9c3e1c
Merge: 447e87cf41c87aecda5cb655086e03561a4c6f9f 4fd43f1c03bf3e3543fdfbd8d20371f1b6c3b4ac
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat May 21 16:38:37 2016 +0200

    Merge branch 'master' of ssh://git.debian.org/git/pkg-multimedia/obs-studio


-- 
obs-studio packaging