[girl/f24: 2/2] Merge branch 'master' into f24
commit 7fef9e19f579e7cedbf12abde0fcc537495911fa
Merge: 348b54a 5a34bc8
Author: Martin Gansser <mgansser(a)alice.de>
Date: Mon Jan 23 14:52:08 2017 +0100
Merge branch 'master' into f24
.gitignore | 1 +
girl.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---