[clipgrab/f24: 2/2] Merge branch 'master' into f24
commit d4281496e67b7be3ca01cd6c52aa8d093ea5b797
Merge: 4386e5e 9efbf20
Author: Martin Gansser <mgansser(a)alice.de>
Date: Fri Dec 9 09:37:51 2016 +0100
Merge branch 'master' into f24
.gitignore | 1 +
clipgrab.spec | 9 ++++++---
clog | 2 --
sources | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
---