[sslscan/el6: 2/2] Merge remote-tracking branch 'origin/master' into el6

[rebus]

commit 62768fd4f1447082f3da8c7ebcbf61cbd26e00ef
Merge: 7a07e9a 57f8bb1
Author: Michal Ambroz <rebus at seznam.cz>
Date:   Sat Feb 15 14:25:17 2014 +0100

    Merge remote-tracking branch 'origin/master' into el6

 .gitignore   |    1 +
 sources      |    2 +-
 sslscan.spec |    7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 3a689bb,3a479dd..213f194
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,3 +1,3 @@@
 -sslscan-1.8.2.tgz
 +/sslscan-1.8.2.tgz
  /sslscan-1.10.1.tar.gz
+ /sslscan-1.10.2.tar.gz