commit bb86fd1499dd8bc79a7e509bdf641539c159034a Merge: 07249b6 ac0376a Author: Momcilo Medic <fedorauser(a)fedoraproject.org&gt; Date: Tue Nov 8 20:37:43 2016 +0100 Merge branch 'master' into f25 .gitignore | 1 + obs-studio.spec | 15 +++++++-------- sources | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) ---