[qtav/f25: 2/2] Merge branch 'master' into f25

[Martin Gansser]

commit 8811b6cb7027fcf6e492380c0cf78301f4266c3f
Merge: 63772d9 06e8a19
Author: Martin Gansser <mgansser at alice.de>
Date:   Mon Sep 19 20:22:08 2016 +0200

    Merge branch 'master' into f25

 .gitignore | 1 +
 qtav.spec  | 9 ++++++---
 sources    | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---