[flowblade/f24: 2/2] Merge branch 'master' into f24

[Leigh Scott]

commit 22dd3b0a01665593f64aa43ac2d3482be4a95eb6
Merge: ec220a4 079700c
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Aug 26 07:36:01 2016 +0100

    Merge branch 'master' into f24

 flowblade.spec | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
---