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

[Martin Gansser]

commit 63772d958c0af38029e590f9daaba0b31c41985d
Merge: 7c1ff59 1148dbe
Author: Martin Gansser <mgansser at alice.de>
Date:   Sat Sep 17 20:15:04 2016 +0200

    Merge branch 'master' into f25

 qtav.spec | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)
---