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

[Leigh Scott]

commit 4ffff398e59ccb4fec78436f6a57dc575c3930cc
Merge: 07241dd 079700c
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Aug 26 07:36:17 2016 +0100

    Merge branch 'master' into f23

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