[SCM] obs-studio/upstream: Merge remote-tracking branch 'origin/upstream' into upstream

[sramacher at users.alioth.debian.org]

New upstream version 18.0.1+dfsg1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/upstream
X-Git-Reftype: branch
X-Git-Oldrev: a03541a0f8b24b87c26c59c1afe1c521170235c4
X-Git-Newrev: 3708b8e092995ea758a7445c55a916e60f2599af

The following commit has been merged in the upstream branch:
commit 3708b8e092995ea758a7445c55a916e60f2599af
Merge: 4e97ab5c98120107052a23b5d6777e5fd1d136e0 a03541a0f8b24b87c26c59c1afe1c521170235c4
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Apr 19 22:09:24 2017 +0200

    Merge remote-tracking branch 'origin/upstream' into upstream


-- 
obs-studio packaging