[nikto/f13/master: 5/5] Merge remote-tracking branch 'origin/master' into f13/master

[rebus]

commit 27314de380a60e6f2f3b1b6e04ade8e5a517c891
Merge: 35434e1 a2c42ce
Author: Michal Ambroz <rebus at seznam.cz>
Date:   Fri Apr 8 01:29:39 2011 +0200

    Merge remote-tracking branch 'origin/master' into f13/master
    
    Conflicts:
    	.gitignore
    	nikto.spec
    	sources

 .gitignore                    |    2 ++
 nikto-2.1.1-libwhisker2.patch |   15 ---------------
 nikto-libwhisker2.patch       |   22 ++++++++++++++++++++++
 nikto.spec                    |   18 ++++++++++++++----
 sources                       |    2 +-
 5 files changed, 39 insertions(+), 20 deletions(-)
---
diff --cc .gitignore
index 833d627,4175026..88d3d76
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,3 @@@
+ nikto-2.03.tar.bz2
 -/nikto-2.1.4.tar.bz2
 +nikto-2.1.1.tar.bz2
++nikto-2.1.4.tar.bz2