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

[Leigh Scott]

commit 7c1ff593c12de2b7331248f7b2b4e538e5538563
Merge: 7ceb425 20cd48f
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sat Sep 17 11:01:58 2016 +0100

    Merge branch 'master' into f25

 qtav.spec | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
---