[flowblade/f23: 2/2] Merge branch 'master' into f23
commit b5ec3c8f1388e793b29fbf72b5583287fa9a4d27
Merge: 16ab266 afa0538
Author: Martin Gansser <mgansser(a)alice.de>
Date: Thu Dec 15 21:46:30 2016 +0100
Merge branch 'master' into f23
.gitignore | 1 +
flowblade.spec | 15 ++++++++-------
sources | 2 +-
3 files changed, 10 insertions(+), 8 deletions(-)
---