[nikto/f17: 7/7] Merge remote-tracking branch 'origin/master' into f17 Addedd "databases" directory to /usr/share/nik

[rebus]

commit 71dd759f261f4bda0f88ad2f2c2182b29496c768
Merge: 40eb192 6776f38
Author: Michal Ambroz <rebus at seznam.cz>
Date:   Thu Oct 4 03:17:52 2012 +0200

    Merge remote-tracking branch 'origin/master' into f17
    Addedd "databases" directory to /usr/share/nikto, omit SSL engine initialization
    
    Conflicts:
    	nikto-libwhisker2.patch
    	nikto.spec

 .gitignore              |    1 +
 nikto-libwhisker2.patch |   12 ++++++++----
 nikto.spec              |   14 ++++++++++++--
 3 files changed, 21 insertions(+), 6 deletions(-)
---