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

[Martin Gansser]

commit 16ab2666eff97d7783e9d58cfa0d11f3b329219e
Merge: 4ffff39 9b28a00
Author: martinkg <mgansser at alice.de>
Date:   Thu Sep 22 14:34:54 2016 +0200

    Merge branch 'master' into f23

 .gitignore     |  1 +
 flowblade.spec | 11 +++++++----
 sources        |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)
---