[nikto/f18: 7/7] Merge remote-tracking branch 'origin/master' into f18

[rebus]

commit e6e1022744da01e2b6d28b86f7efafd2666f011c
Merge: 8b052dd 0fdda81
Author: Michal Ambroz <rebus at seznam.cz>
Date:   Sat Feb 2 12:57:56 2013 +0100

    Merge remote-tracking branch 'origin/master' into f18
    
    Conflicts:
    	nikto-libwhisker2.patch
    	nikto.spec

 .gitignore              |    7 ++++---
 nikto-libwhisker2.patch |   12 ++++++++----
 nikto.spec              |   16 ++++++++++++++--
 3 files changed, 26 insertions(+), 9 deletions(-)
---
diff --cc .gitignore
index 88d3d76,689aade..9bd403a
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,4 +1,4 @@@
--nikto-2.03.tar.bz2
--nikto-2.1.1.tar.bz2
--nikto-2.1.4.tar.bz2
++/nikto-2.03.tar.bz2
++/nikto-2.1.1.tar.bz2
++/nikto-2.1.4.tar.bz2
+ /nikto-2.1.5.tar.bz2