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

[Martin Gansser]

commit 604ac3f70df63715ddeffaccd592d83cb5b4615c
Merge: 8811b6c 7b06340
Author: Martin Gansser <mgansser at alice.de>
Date:   Mon Oct 17 09:04:11 2016 +0200

    Merge branch 'master' into f25

 qtav.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
---