[girl/f24: 2/2] Merge branch 'master' into f24

[Martin Gansser]

commit 6bbf8d73f3aa703975b4fdfd346386ccb94ab378
Merge: 6b95c0a 10578c0
Author: Martin Gansser <mgansser at alice.de>
Date:   Fri Oct 7 18:32:29 2016 +0200

    Merge branch 'master' into f24

 .gitignore | 1 +
 girl.spec  | 5 ++++-
 sources    | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index bf5e9e5,fbd9c75..82691ee
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,2 @@@
 -/girl-9.4.0.tar.xz
  /girl-9.5.1.tar.xz
+ /girl-9.5.2.tar.xz