commit 07249b60df8def9f81b7673c4f18f53c416a4400 Merge: 4e5886b 9de446b Author: Momcilo Medic <fedorauser(a)fedoraproject.org&gt; Date: Thu Oct 20 19:15:17 2016 +0200 Merge branch 'master' into f25 .gitignore | 1 + obs-studio.spec | 15 ++++++++++++--- sources | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) ---